Skip to content

Commit e902ae2

Browse files
v0.7.0-1135, updated query answering and consistency checking parallelization, answers cache limits, github actions for releases
1 parent 1fa28f0 commit e902ae2

File tree

733 files changed

+184280
-135085
lines changed

Some content is hidden

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

733 files changed

+184280
-135085
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
928 KB
Binary file not shown.
3.99 MB
Binary file not shown.
910 KB
Binary file not shown.
4.04 MB
Binary file not shown.
928 KB
Binary file not shown.
3.99 MB
Binary file not shown.
1.07 MB
Binary file not shown.
439 KB
Binary file not shown.
4.27 MB
Binary file not shown.
10.2 MB
Binary file not shown.
10.5 KB
Binary file not shown.
316 KB
Binary file not shown.
278 KB
Binary file not shown.
2.06 MB
Binary file not shown.
1.15 MB
Binary file not shown.
2.19 MB
Binary file not shown.
7.31 MB
Binary file not shown.
81 KB
Binary file not shown.
484 KB
Binary file not shown.
916 KB
Binary file not shown.
756 KB
Binary file not shown.
190 KB
Binary file not shown.
1010 KB
Binary file not shown.
1.28 MB
Binary file not shown.
3.88 MB
Binary file not shown.
216 KB
Binary file not shown.
636 KB
Binary file not shown.
149 KB
Binary file not shown.
1020 KB
Binary file not shown.
2.18 MB
Binary file not shown.
15.4 MB
Binary file not shown.
781 KB
Binary file not shown.
2.58 MB
Binary file not shown.
356 KB
Binary file not shown.
1.33 MB
Binary file not shown.
471 KB
Binary file not shown.
1.15 MB
Binary file not shown.
36 KB
Binary file not shown.
516 KB
Binary file not shown.
85 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
928 KB
Binary file not shown.
3.99 MB
Binary file not shown.
910 KB
Binary file not shown.
4.04 MB
Binary file not shown.
928 KB
Binary file not shown.
3.99 MB
Binary file not shown.
1.07 MB
Binary file not shown.
439 KB
Binary file not shown.
4.27 MB
Binary file not shown.
10.2 MB
Binary file not shown.
10.5 KB
Binary file not shown.
316 KB
Binary file not shown.
278 KB
Binary file not shown.
2.06 MB
Binary file not shown.
1.15 MB
Binary file not shown.
2.19 MB
Binary file not shown.
7.31 MB
Binary file not shown.
81 KB
Binary file not shown.
484 KB
Binary file not shown.
916 KB
Binary file not shown.
756 KB
Binary file not shown.
190 KB
Binary file not shown.
1010 KB
Binary file not shown.
1.28 MB
Binary file not shown.
3.88 MB
Binary file not shown.
216 KB
Binary file not shown.
636 KB
Binary file not shown.
149 KB
Binary file not shown.
1020 KB
Binary file not shown.
2.18 MB
Binary file not shown.
15.4 MB
Binary file not shown.
781 KB
Binary file not shown.
2.58 MB
Binary file not shown.
356 KB
Binary file not shown.
1.33 MB
Binary file not shown.
471 KB
Binary file not shown.
1.15 MB
Binary file not shown.
36 KB
Binary file not shown.
516 KB
Binary file not shown.
85 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
28.1 KB
Binary file not shown.
28.5 KB
Binary file not shown.
28.5 KB
Binary file not shown.
23.8 KB
Binary file not shown.
228 KB
Binary file not shown.
1.73 KB
Binary file not shown.
16.4 KB
Binary file not shown.
41.1 KB
Binary file not shown.
790 KB
Binary file not shown.
5.27 KB
Binary file not shown.
3 KB
Binary file not shown.
54.6 KB
Binary file not shown.
364 KB
Binary file not shown.
54.5 KB
Binary file not shown.
22.9 KB
Binary file not shown.
118 KB
Binary file not shown.
54.5 KB
Binary file not shown.
73.8 KB
Binary file not shown.
8.24 KB
Binary file not shown.
7.05 KB
Binary file not shown.
16 KB
Binary file not shown.

Konclude-VS15.vcxproj

Lines changed: 6717 additions & 6491 deletions
Large diffs are not rendered by default.

Konclude.pri

Lines changed: 317 additions & 91 deletions
Large diffs are not rendered by default.

Konclude.pro

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,50 @@
1-
2-
message("Updating Konclude version from Git Revision.")
3-
4-
# Create our custom gitbuild target.
5-
win32:gitbuild.commands = $${PWD}/WinGitBuildScript.bat
6-
else:gitbuild.commands = $${PWD}/UnixGitBuildScript.sh
7-
QMAKE_EXTRA_TARGETS += gitbuild
8-
9-
PRE_TARGETDEPS = gitbuild
10-
11-
message("Preparing source code of Konclude.")
12-
TEMPLATE = app
13-
TARGET = Konclude
14-
DESTDIR = ./Release
15-
QT += xml network concurrent
16-
CONFIG += release console warn_off c++11
17-
DEFINES += QT_XML_LIB QT_NETWORK_LIB KONCLUDE_REDLAND_INTEGRATION KONCLUDE_FORCE_ALL_DEBUG_DEACTIVATED
18-
INCLUDEPATH += ./generatedfiles \
19-
./GeneratedFiles/Release \
20-
./Source \
21-
.
22-
DEPENDPATH += .
23-
MOC_DIR += ./GeneratedFiles/release
24-
OBJECTS_DIR += release
25-
UI_DIR += ./GeneratedFiles
26-
RCC_DIR += ./GeneratedFiles
27-
28-
#Include file(s)
29-
include(Konclude.pri)
30-
31-
unix:!macx: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/librdf.a
32-
unix:!macx: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/libraptor2.a
33-
unix:!macx: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/librasqal.a
34-
unix:!macx: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/libxml2.a
35-
unix:!macx: LIBS += -lz -lltdl -lgmp -ldl
36-
37-
INCLUDEPATH += $$PWD/External/librdf/Linux/x64/include
38-
DEPENDPATH += $$PWD/External/librdf/Linux/x64/include
39-
40-
unix:!macx: PRE_TARGETDEPS += $$PWD/External/librdf/Linux/x64/lib/release/librdf.a
41-
unix:!macx: PRE_TARGETDEPS += $$PWD/External/librdf/Linux/x64/lib/release/libraptor2.a
42-
unix:!macx: PRE_TARGETDEPS += $$PWD/External/librdf/Linux/x64/lib/release/librasqal.a
43-
unix:!macx: PRE_TARGETDEPS += $$PWD/External/librdf/Linux/x64/lib/release/libxml2.a
44-
45-
1+
2+
message("Updating Konclude version from Git Revision.")
3+
4+
# Create our custom gitbuild target.
5+
win32:gitbuild.commands = $${PWD}/WinGitBuildScript.bat
6+
else:gitbuild.commands = $${PWD}/UnixGitBuildScript.sh
7+
QMAKE_EXTRA_TARGETS += gitbuild
8+
9+
PRE_TARGETDEPS = gitbuild
10+
11+
message("Preparing source code of Konclude.")
12+
TEMPLATE = app
13+
TARGET = Konclude
14+
DESTDIR = ./Release
15+
QT += xml network concurrent
16+
CONFIG += release console warn_off c++11
17+
DEFINES += QT_XML_LIB QT_NETWORK_LIB KONCLUDE_REDLAND_INTEGRATION KONCLUDE_FORCE_ALL_DEBUG_DEACTIVATED
18+
INCLUDEPATH += ./generatedfiles \
19+
./GeneratedFiles/Release \
20+
./Source \
21+
.
22+
DEPENDPATH += .
23+
MOC_DIR += ./GeneratedFiles/release
24+
OBJECTS_DIR += release
25+
UI_DIR += ./GeneratedFiles
26+
RCC_DIR += ./GeneratedFiles
27+
28+
#Include file(s)
29+
include(Konclude.pri)
30+
31+
unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/librdf.a
32+
unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/libraptor2.a
33+
unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/librasqal.a
34+
unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/libxml2.a
35+
unix: LIBS += $$PWD/External/jemalloc/Linux/x64/lib/release/libjemalloc.a
36+
unix: LIBS += -lz -lltdl -lgmp -ldl -L External/jemalloc/Linux/x64/lib/release/ -ljemalloc
37+
38+
unix: INCLUDEPATH += $$PWD/External/librdf/Linux/x64/include
39+
unix: DEPENDPATH += $$PWD/External/librdf/Linux/x64/include
40+
41+
42+
win32: LIBS += "C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x64\kernel32.Lib"
43+
win32: LIBS += $$PWD/External/librdf/Windows/x64/lib/Release/librdf.lib
44+
win32: LIBS += $$PWD/External/librdf/Windows/x64/lib/Release/raptor2.lib
45+
win32: LIBS += $$PWD/External/librdf/Windows/x64/lib/Release/rasqal.lib
46+
win32: LIBS += $$PWD/External/librdf/Windows/x64/lib/Release/libsv.lib
47+
48+
win32: INCLUDEPATH += $$PWD/External/librdf/Windows/x64/include
49+
win32: DEPENDPATH += $$PWD/External/librdf/Windows/x64/include
50+

Readme.md

Lines changed: 209 additions & 205 deletions
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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 Lesser General Public
9+
* License (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 (Lesser) General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU (Lesser) General Public
17+
* License along with Konclude. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
*/
20+
21+
#include "CConcurrentTaskScheduler.h"
22+
23+
24+
namespace Konclude {
25+
26+
namespace Concurrent {
27+
28+
CConcurrentTaskScheduler::CConcurrentTaskScheduler() {
29+
}
30+
31+
32+
33+
34+
}; // end namespace Concurrent
35+
36+
}; // end namespace Konclude
37+
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
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 Lesser General Public
9+
* License (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 (Lesser) General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU (Lesser) General Public
17+
* License along with Konclude. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
*/
20+
21+
#ifndef KONCLUDE_CONCURRENT_CCONCURRENTTASKSCHEDULER_H
22+
#define KONCLUDE_CONCURRENT_CCONCURRENTTASKSCHEDULER_H
23+
24+
// Library includes
25+
#include <QtConcurrent>
26+
27+
28+
// Namespace includes
29+
#include "ConcurrentSettings.h"
30+
31+
// Other includes
32+
33+
34+
// Logger includes
35+
#include "Logger/CLogger.h"
36+
37+
38+
namespace Konclude {
39+
40+
namespace Concurrent {
41+
42+
43+
/*!
44+
*
45+
* \class CConcurrentTaskScheduler
46+
* \author Andreas Steigmiller
47+
* \version 0.1
48+
* \brief TODO
49+
*
50+
*/
51+
class CConcurrentTaskScheduler {
52+
// public methods
53+
public:
54+
//! Constructor
55+
CConcurrentTaskScheduler();
56+
57+
template <typename Functor>
58+
static void run(Functor functor) {
59+
if (QThreadPool::globalInstance()->maxThreadCount() > 1) {
60+
QtConcurrent::run(functor);
61+
} else {
62+
QVector<int> vec(1);
63+
QtConcurrent::blockingMap(vec, [&](int& data) {
64+
functor();
65+
});
66+
}
67+
}
68+
69+
70+
// protected methods
71+
protected:
72+
73+
// protected variables
74+
protected:
75+
76+
// private methods
77+
private:
78+
79+
// private variables
80+
private:
81+
};
82+
83+
84+
}; // end namespace Concurrent
85+
86+
}; // end namespace Konclude
87+
88+
#endif // KONCLUDE_CONCURRENT_CCONCURRENTTASKSCHEDULER_H

0 commit comments

Comments
 (0)