Skip to content

Commit 1188b71

Browse files
first version of incremental and concurrent query answering, several fixes
1 parent 2878d70 commit 1188b71

File tree

277 files changed

+17609
-2911
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+17609
-2911
lines changed

Konclude.pri

Lines changed: 140 additions & 67 deletions
Large diffs are not rendered by default.

Konclude.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ message("Preparing source code of Konclude.")
1212
TEMPLATE = app
1313
TARGET = Konclude
1414
DESTDIR = ./Release
15-
QT += xml network
15+
QT += xml network concurrent
1616
CONFIG += release console warn_off c++11
1717
DEFINES += QT_XML_LIB QT_NETWORK_LIB KONCLUDE_REDLAND_INTEGRATION KONCLUDE_FORCE_ALL_DEBUG_DEACTIVATED
1818
INCLUDEPATH += ./generatedfiles \

KoncludeLIB.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ message("Preparing source code of Konclude.")
1717
TEMPLATE = lib
1818
TARGET = Konclude
1919
DESTDIR = ./Release
20-
QT += xml network
20+
QT += xml network concurrent
2121
CONFIG += release warn_off c++11
2222
DEFINES += QT_XML_LIB QT_NETWORK_LIB KONCLUDE_FORCE_ALL_DEBUG_DEACTIVATED KONCLUDE_COMPILE_JNI_INTERFACE
2323
INCLUDEPATH += ./generatedfiles \

KoncludeWithoutRedland.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ message("Preparing source code of Konclude.")
1212
TEMPLATE = app
1313
TARGET = Konclude
1414
DESTDIR = ./Release
15-
QT += xml network
15+
QT += xml network concurrent
1616
CONFIG += release console warn_off c++11
1717
DEFINES += QT_XML_LIB QT_NETWORK_LIB KONCLUDE_FORCE_ALL_DEBUG_DEACTIVATED
1818
INCLUDEPATH += ./generatedfiles \
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright (C) 2013-2015, 2019 by the Konclude Developer Team.
3+
*
4+
* This file is part of the reasoning system Konclude.
5+
* For details and support, see <http://konclude.com/>.
6+
*
7+
* Konclude is free software: you can redistribute it and/or modify
8+
* it under the terms of version 3 of the GNU General Public License
9+
* (LGPLv3) as published by the Free Software Foundation.
10+
*
11+
* Konclude is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with Konclude. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
*/
20+
21+
#include "CMemoryPoolNewAllocationContext.h"
22+
23+
24+
namespace Konclude {
25+
26+
namespace Context {
27+
28+
CMemoryPoolNewAllocationContext::CMemoryPoolNewAllocationContext(cint64 defaultPoolSize) : CMemoryPoolContainer(), mDefNewMemPoolProvider(defaultPoolSize), mMemMan(this, &mDefNewMemPoolProvider) {
29+
}
30+
31+
CMemoryPoolNewAllocationContext::~CMemoryPoolNewAllocationContext() {
32+
}
33+
34+
CMemoryAllocationManager* CMemoryPoolNewAllocationContext::getMemoryAllocationManager() {
35+
return &mMemMan;
36+
}
37+
38+
39+
40+
}; // end namespace Context
41+
42+
}; // end namespace Konclude
43+
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/*
2+
* Copyright (C) 2013-2015, 2019 by the Konclude Developer Team.
3+
*
4+
* This file is part of the reasoning system Konclude.
5+
* For details and support, see <http://konclude.com/>.
6+
*
7+
* Konclude is free software: you can redistribute it and/or modify
8+
* it under the terms of version 3 of the GNU General Public License
9+
* (LGPLv3) as published by the Free Software Foundation.
10+
*
11+
* Konclude is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with Konclude. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
*/
20+
21+
#ifndef KONCLUDE_CONTEXT_CMEMORYPOOLNEWALLOCATIONCONTEXT_H
22+
#define KONCLUDE_CONTEXT_CMEMORYPOOLNEWALLOCATIONCONTEXT_H
23+
24+
// Library includes
25+
26+
27+
// Namespace includes
28+
#include "ContextSettings.h"
29+
#include "CContext.h"
30+
31+
// Other includes
32+
#include "Utilities/Memory/CMemoryAllocationManager.h"
33+
#include "Utilities/Memory/CNewAllocationMemoryPoolProvider.h"
34+
#include "Utilities/Memory/CMemoryPoolContainerAllocationManager.h"
35+
#include "Utilities/Memory/CMemoryPoolContainer.h"
36+
37+
#include "Utilities/UtilitiesSettings.h"
38+
39+
// Logger includes
40+
#include "Logger/CLogger.h"
41+
42+
43+
namespace Konclude {
44+
45+
using namespace Utilities;
46+
using namespace Utilities::Memory;
47+
48+
namespace Context {
49+
50+
51+
/*!
52+
*
53+
* \class CMemoryPoolNewAllocationContext
54+
* \author Andreas Steigmiller
55+
* \version 0.1
56+
* \brief TODO
57+
*
58+
*/
59+
class CMemoryPoolNewAllocationContext : public CContext, public CMemoryPoolContainer {
60+
// public methods
61+
public:
62+
//! Constructor
63+
CMemoryPoolNewAllocationContext(cint64 defaultPoolSize = DEFAULTMEMORYPOOLSIZE);
64+
65+
//! Destructor
66+
virtual ~CMemoryPoolNewAllocationContext();
67+
68+
virtual CMemoryAllocationManager* getMemoryAllocationManager();
69+
70+
71+
// protected methods
72+
protected:
73+
74+
// protected variables
75+
protected:
76+
CNewAllocationMemoryPoolProvider mDefNewMemPoolProvider;
77+
CMemoryPoolContainerAllocationManager mMemMan;
78+
79+
// private methods
80+
private:
81+
82+
// private variables
83+
private:
84+
};
85+
86+
87+
}; // end namespace Context
88+
89+
}; // end namespace Konclude
90+
91+
#endif // KONCLUDE_CONTEXT_CMEMORYPOOLNEWALLOCATIONCONTEXT_H
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright (C) 2013-2015, 2019 by the Konclude Developer Team.
3+
*
4+
* This file is part of the reasoning system Konclude.
5+
* For details and support, see <http://konclude.com/>.
6+
*
7+
* Konclude is free software: you can redistribute it and/or modify
8+
* it under the terms of version 3 of the GNU General Public License
9+
* (LGPLv3) as published by the Free Software Foundation.
10+
*
11+
* Konclude is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with Konclude. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
*/
20+
21+
#include "CMemoryPoolNewAllocationIncreasingContext.h"
22+
23+
24+
namespace Konclude {
25+
26+
namespace Context {
27+
28+
CMemoryPoolNewAllocationIncreasingContext::CMemoryPoolNewAllocationIncreasingContext(cint64 defaultPoolSize, cint64 maxPoolSize, double increasingFactor) : CMemoryPoolContainer(), mDefNewMemPoolProvider(defaultPoolSize, maxPoolSize, increasingFactor), mMemMan(this, &mDefNewMemPoolProvider) {
29+
}
30+
31+
CMemoryPoolNewAllocationIncreasingContext::~CMemoryPoolNewAllocationIncreasingContext() {
32+
}
33+
34+
CMemoryAllocationManager* CMemoryPoolNewAllocationIncreasingContext::getMemoryAllocationManager() {
35+
return &mMemMan;
36+
}
37+
38+
39+
40+
}; // end namespace Context
41+
42+
}; // end namespace Konclude
43+
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/*
2+
* Copyright (C) 2013-2015, 2019 by the Konclude Developer Team.
3+
*
4+
* This file is part of the reasoning system Konclude.
5+
* For details and support, see <http://konclude.com/>.
6+
*
7+
* Konclude is free software: you can redistribute it and/or modify
8+
* it under the terms of version 3 of the GNU General Public License
9+
* (LGPLv3) as published by the Free Software Foundation.
10+
*
11+
* Konclude is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with Konclude. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
*/
20+
21+
#ifndef KONCLUDE_CONTEXT_CMEMORYPOOLNEWALLOCATIONINCREASINGCONTEXT_H
22+
#define KONCLUDE_CONTEXT_CMEMORYPOOLNEWALLOCATIONINCREASINGCONTEXT_H
23+
24+
// Library includes
25+
26+
27+
// Namespace includes
28+
#include "ContextSettings.h"
29+
#include "CContext.h"
30+
31+
// Other includes
32+
#include "Utilities/Memory/CMemoryAllocationManager.h"
33+
#include "Utilities/Memory/CNewAllocationIncreasingMemoryPoolProvider.h"
34+
#include "Utilities/Memory/CMemoryPoolContainerAllocationManager.h"
35+
#include "Utilities/Memory/CMemoryPoolContainer.h"
36+
37+
#include "Utilities/UtilitiesSettings.h"
38+
39+
// Logger includes
40+
#include "Logger/CLogger.h"
41+
42+
43+
namespace Konclude {
44+
45+
using namespace Utilities;
46+
using namespace Utilities::Memory;
47+
48+
namespace Context {
49+
50+
51+
/*!
52+
*
53+
* \class CMemoryPoolNewAllocationIncreasingContext
54+
* \author Andreas Steigmiller
55+
* \version 0.1
56+
* \brief TODO
57+
*
58+
*/
59+
class CMemoryPoolNewAllocationIncreasingContext : public CContext, public CMemoryPoolContainer {
60+
// public methods
61+
public:
62+
//! Constructor
63+
CMemoryPoolNewAllocationIncreasingContext(cint64 defaultPoolSize = DEFAULTMEMORYPOOLSIZE, cint64 maxPoolSize = -1, double increasingFactor = 2.);
64+
65+
//! Destructor
66+
virtual ~CMemoryPoolNewAllocationIncreasingContext();
67+
68+
virtual CMemoryAllocationManager* getMemoryAllocationManager();
69+
70+
71+
// protected methods
72+
protected:
73+
74+
// protected variables
75+
protected:
76+
CNewAllocationIncreasingMemoryPoolProvider mDefNewMemPoolProvider;
77+
CMemoryPoolContainerAllocationManager mMemMan;
78+
79+
// private methods
80+
private:
81+
82+
// private variables
83+
private:
84+
};
85+
86+
87+
}; // end namespace Context
88+
89+
}; // end namespace Konclude
90+
91+
#endif // KONCLUDE_CONTEXT_CMEMORYPOOLNEWALLOCATIONINCREASINGCONTEXT_H
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright (C) 2013-2015, 2019 by the Konclude Developer Team.
3+
*
4+
* This file is part of the reasoning system Konclude.
5+
* For details and support, see <http://konclude.com/>.
6+
*
7+
* Konclude is free software: you can redistribute it and/or modify
8+
* it under the terms of version 3 of the GNU General Public License
9+
* (LGPLv3) as published by the Free Software Foundation.
10+
*
11+
* Konclude is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with Konclude. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
*/
20+
21+
#include "CMemoryPoolReallocationIncreasingContext.h"
22+
23+
24+
namespace Konclude {
25+
26+
namespace Context {
27+
28+
CMemoryPoolReallocationIncreasingContext::CMemoryPoolReallocationIncreasingContext(CMemoryAllocationManager* reallocationMemMan, cint64 defaultPoolSize, cint64 maxPoolSize, double increasingFactor) : CMemoryPoolContainer(), mDefNewMemPoolProvider(reallocationMemMan, defaultPoolSize, maxPoolSize, increasingFactor), mMemMan(this, &mDefNewMemPoolProvider) {
29+
}
30+
31+
CMemoryPoolReallocationIncreasingContext::~CMemoryPoolReallocationIncreasingContext() {
32+
}
33+
34+
CMemoryAllocationManager* CMemoryPoolReallocationIncreasingContext::getMemoryAllocationManager() {
35+
return &mMemMan;
36+
}
37+
38+
39+
40+
}; // end namespace Context
41+
42+
}; // end namespace Konclude
43+

0 commit comments

Comments
 (0)