Skip to content

Commit e21a368

Browse files
andreas-steigmillerandreas-steigmiller
committed
v0.6.2-939, several minor fixes, improved parsing of rules, improved language tag recognition, realization fixes, updated log messages
1 parent 8ac1b17 commit e21a368

29 files changed

+348
-82
lines changed

‎Source/Control/Loader/CCommandLineTranlatorHelpLoader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ namespace Konclude {
4747

4848
CLoader *CCommandLineTranlatorHelpLoader::load() {
4949

50-
LOG(INFO,"::Konclude::Loader::OWLlinkTranslationHelpLoader",logTr(
50+
CLogger::getInstance()->waitSynchronization();
51+
LOG(INFO, "::Konclude::Loader::OWLlinkTranslationHelpLoader", logTr(
5152
"Usage: 'Konclude' <command> [parameters]\n"
5253
"\n"
5354
"Available commands:\n"

‎Source/Control/Loader/CConfigurableCoutLogObserverLoader.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,11 @@ namespace Konclude {
6565

6666
consoleSingletonLogObserver = new CConsolePrintConfigurableLogObserver(infoDomainList,60.,true,false,true,true);
6767
CLogger::getInstance()->addLogObserver(consoleSingletonLogObserver);
68-
CLogger::getInstance()->waitSynchronization();
6968

7069
return this;
7170
}
7271

7372
CLoader *CConfigurableCoutLogObserverLoader::exit() {
74-
CLogger::getInstance()->waitSynchronization();
7573
CLogger::getInstance()->removeObserverFromAllDomains(consoleSingletonLogObserver);
7674
delete consoleSingletonLogObserver;
7775
return this;

‎Source/Control/Loader/CCoutLogObserverLoader.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ namespace Konclude {
5353
CLogger::getInstance()->removeObserverFromAllDomains(consoleSingletonLogObserver);
5454
CLogger::getInstance()->addLogObserver(consoleSingletonLogObserver);
5555

56-
CLogger::getInstance()->waitSynchronization();
57-
5856
}
5957
return this;
6058
}

‎Source/Control/Loader/CSPARQLBatchFileLoader.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,9 @@ namespace Konclude {
178178

179179
} else {
180180
LOG(ERROR,getLogDomain(),logTr("SPARQL request file '%1' not found.").arg(reqFileString),this);
181+
// seems to be required to preventing crashes
182+
// TODO: fix
183+
this->usleep(200);
181184
concludeOWLlinkContent();
182185
}
183186
}

‎Source/Parser/CParsingExpressionSplitter.cpp

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,24 @@ namespace Konclude {
7070
if (individualExpression) {
7171
mIndiList.append(individualExpression);
7272
}
73+
CDataPropertyTermExpression* dataPropertyExpression = dynamic_cast<CDataPropertyTermExpression*>(expression);
74+
if (dataPropertyExpression) {
75+
mDataPropertyList.append(dataPropertyExpression);
76+
}
77+
CDataRangeTermExpression* dataRangeExpression = dynamic_cast<CDataRangeTermExpression*>(expression);
78+
if (dataRangeExpression) {
79+
mDataRangeList.append(dataRangeExpression);
80+
}
81+
CDataLiteralTermExpression* dataLitExpression = dynamic_cast<CDataLiteralTermExpression*>(expression);
82+
if (dataRangeExpression) {
83+
mDataLitList.append(dataLitExpression);
84+
}
7385
}
7486
return true;
7587
}
7688

7789

78-
bool CParsingExpressionSplitter::proofExpressionComposition(cint64 requiredClassExpressions, cint64 requiredObjectPropertyExpressions, cint64 requiredIndividualExpressions, cint64 requiredVariableExpressions, cint64 requiredNotVariableExpressions) {
90+
bool CParsingExpressionSplitter::proofExpressionComposition(cint64 requiredClassExpressions, cint64 requiredObjectPropertyExpressions, cint64 requiredIndividualExpressions, cint64 requiredVariableExpressions, cint64 requiredNotVariableExpressions, cint64 dataRangeExpressions, cint64 dataPropertyExpressions) {
7991
if (mClassList.count() < requiredClassExpressions) {
8092
LOG(ERROR,"::Konclude::Reasoner::Generator::ExpressionSplitter",logTr("Couldn't extract minimal required %1 Class-Expressions, extracted Class-Expressions %2.").arg(requiredClassExpressions).arg(mClassList.count()),this);
8193
return false;
@@ -96,9 +108,32 @@ namespace Konclude {
96108
LOG(ERROR,"::Konclude::Reasoner::Generator::ExpressionSplitter",logTr("Couldn't extract minimal required %1 Non-Variable-Expressions, extracted Non-Variable-Expressions %2.").arg(requiredNotVariableExpressions).arg(mNotObjIndiVarList.count()),this);
97109
return false;
98110
}
111+
if (mDataRangeList.count() < dataRangeExpressions) {
112+
LOG(ERROR, "::Konclude::Reasoner::Generator::ExpressionSplitter", logTr("Couldn't extract minimal required %1 DataRange-Expressions, extracted DataRange-Expressions %2.").arg(dataRangeExpressions).arg(mDataRangeList.count()), this);
113+
return false;
114+
}
115+
if (mDataPropertyList.count() < dataPropertyExpressions) {
116+
LOG(ERROR, "::Konclude::Reasoner::Generator::ExpressionSplitter", logTr("Couldn't extract minimal required %1 DataProperty-Expressions, extracted DataProperty-Expressions %2.").arg(dataPropertyExpressions).arg(mDataPropertyList.count()), this);
117+
return false;
118+
}
99119
return true;
100120
}
101121

122+
123+
CEXPRESSIONLIST<CDataRangeTermExpression*>* CParsingExpressionSplitter::getDataRangeTermExpressionList() {
124+
return &mDataRangeList;
125+
}
126+
127+
128+
CEXPRESSIONLIST<CDataLiteralTermExpression*>* CParsingExpressionSplitter::getDataLiteralTermExpressionList() {
129+
return &mDataLitList;
130+
}
131+
132+
CEXPRESSIONLIST<CDataPropertyTermExpression*>* CParsingExpressionSplitter::getDataPropertyTermExpressionList() {
133+
return &mDataPropertyList;
134+
}
135+
136+
102137
CEXPRESSIONLIST<CClassTermExpression*>* CParsingExpressionSplitter::getClassTermExpressionList() {
103138
return &mClassList;
104139
}
@@ -162,6 +197,32 @@ namespace Konclude {
162197
return mIndiList.at(1);
163198
}
164199

200+
CDataPropertyTermExpression* CParsingExpressionSplitter::getFirstDataPropertyTermExpression() {
201+
return mDataPropertyList.first();
202+
}
203+
204+
CDataPropertyTermExpression* CParsingExpressionSplitter::getSecondDataPropertyTermExpression() {
205+
return mDataPropertyList.at(1);
206+
}
207+
208+
209+
CDataRangeTermExpression* CParsingExpressionSplitter::getFirstDataRangeTermExpression() {
210+
return mDataRangeList.first();
211+
}
212+
213+
CDataRangeTermExpression* CParsingExpressionSplitter::getSecondDataRangeTermExpression() {
214+
return mDataRangeList.at(1);
215+
}
216+
217+
CDataLiteralTermExpression* CParsingExpressionSplitter::getFirstDataLiteralTermExpression() {
218+
return mDataLitList.first();
219+
}
220+
221+
CDataLiteralTermExpression* CParsingExpressionSplitter::getSecondDataLiteralTermExpression() {
222+
return mDataLitList.at(1);
223+
}
224+
225+
165226
}; // end namespace Parser
166227

167228
}; // end namespace Konclude

‎Source/Parser/CParsingExpressionSplitter.h

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
#include "Parser/Expressions/CObjectPropertyTermExpression.h"
3737
#include "Parser/Expressions/CIndividualTermExpression.h"
3838
#include "Parser/Expressions/CObjectIndividualVariableExpression.h"
39+
#include "Parser/Expressions/CDataPropertyTermExpression.h"
40+
#include "Parser/Expressions/CDataRangeTermExpression.h"
41+
#include "Parser/Expressions/CDataLiteralTermExpression.h"
3942

4043
// Logger includes
4144
#include "Logger/CLogger.h"
@@ -69,11 +72,14 @@ namespace Konclude {
6972
//! Destructor
7073
virtual ~CParsingExpressionSplitter();
7174

72-
bool proofExpressionComposition(cint64 requiredClassExpressions, cint64 requiredObjectPropertyExpressions = 0, cint64 requiredIndividualExpressions = 0, cint64 requiredVariableExpressions = 0, cint64 requiredNotVariableExpressions = 0);
75+
bool proofExpressionComposition(cint64 requiredClassExpressions, cint64 requiredObjectPropertyExpressions = 0, cint64 requiredIndividualExpressions = 0, cint64 requiredVariableExpressions = 0, cint64 requiredNotVariableExpressions = 0, cint64 dataRangeExpressions = 0, cint64 dataPropertyExpressions = 0);
7376

7477
CEXPRESSIONLIST<CClassTermExpression*>* getClassTermExpressionList();
7578
CEXPRESSIONLIST<CObjectPropertyTermExpression*>* getObjectPropertyTermExpressionList();
7679
CEXPRESSIONLIST<CIndividualTermExpression*>* getIndividualTermExpressionList();
80+
CEXPRESSIONLIST<CDataPropertyTermExpression*>* getDataPropertyTermExpressionList();
81+
CEXPRESSIONLIST<CDataRangeTermExpression*>* getDataRangeTermExpressionList();
82+
CEXPRESSIONLIST<CDataLiteralTermExpression*>* getDataLiteralTermExpressionList();
7783

7884
CEXPRESSIONLIST<CObjectIndividualVariableExpression*>* getClassVariableTermExpressionList();
7985
CEXPRESSIONLIST<CClassTermExpression*>* getClassNotVariableTermExpressionList();
@@ -91,6 +97,17 @@ namespace Konclude {
9197
CObjectIndividualVariableExpression* getFirstClassVariableTermExpression();
9298
CObjectIndividualVariableExpression* getSecondClassVariableTermExpression();
9399

100+
101+
CDataPropertyTermExpression* getFirstDataPropertyTermExpression();
102+
CDataPropertyTermExpression* getSecondDataPropertyTermExpression();
103+
104+
105+
CDataRangeTermExpression* getFirstDataRangeTermExpression();
106+
CDataRangeTermExpression* getSecondDataRangeTermExpression();
107+
108+
CDataLiteralTermExpression* getFirstDataLiteralTermExpression();
109+
CDataLiteralTermExpression* getSecondDataLiteralTermExpression();
110+
94111
// protected methods
95112
protected:
96113
bool splitExpressions();
@@ -101,6 +118,9 @@ namespace Konclude {
101118
CEXPRESSIONLIST<CClassTermExpression*> mClassList;
102119
CEXPRESSIONLIST<CObjectPropertyTermExpression*> mObjectPropertyList;
103120
CEXPRESSIONLIST<CIndividualTermExpression*> mIndiList;
121+
CEXPRESSIONLIST<CDataPropertyTermExpression*> mDataPropertyList;
122+
CEXPRESSIONLIST<CDataRangeTermExpression*> mDataRangeList;
123+
CEXPRESSIONLIST<CDataLiteralTermExpression*> mDataLitList;
104124

105125
CEXPRESSIONLIST<CObjectIndividualVariableExpression*> mObjIndiVarList;
106126
CEXPRESSIONLIST<CClassTermExpression*> mNotObjIndiVarList;

‎Source/Parser/CXMLOWL2StreamHandler.cpp

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,8 @@ namespace Konclude {
586586

587587
mBaseParseFunctionJumpHash.insert(CStringRefStringHasher("Head"),CStreamParseFunctionData(&CXMLOWL2StreamHandler::jumpFunctionParseRuleAtomHeadNode));
588588
mBaseParseFunctionJumpHash.insert(CStringRefStringHasher("Body"),CStreamParseFunctionData(&CXMLOWL2StreamHandler::jumpFunctionParseRuleAtomBodyNode));
589-
mBaseParseFunctionJumpHash.insert(CStringRefStringHasher("ObjectPropertyAtom"),CStreamParseFunctionData(&CXMLOWL2StreamHandler::jumpFunctionParseRulePropertyAtomNode));
589+
mBaseParseFunctionJumpHash.insert(CStringRefStringHasher("ObjectPropertyAtom"), CStreamParseFunctionData(&CXMLOWL2StreamHandler::jumpFunctionParseRuleObjectPropertyAtomNode));
590+
mBaseParseFunctionJumpHash.insert(CStringRefStringHasher("DataPropertyAtom"), CStreamParseFunctionData(&CXMLOWL2StreamHandler::jumpFunctionParseRuleDataPropertyAtomNode));
590591
mBaseParseFunctionJumpHash.insert(CStringRefStringHasher("ClassAtom"),CStreamParseFunctionData(&CXMLOWL2StreamHandler::jumpFunctionParseRuleClassAtomNode));
591592

592593
mBaseParseFunctionJumpHash.insert(CStringRefStringHasher("DifferentIndividualsAtom"),CStreamParseFunctionData(&CXMLOWL2StreamHandler::jumpFunctionParseDifferentIndividualsAtomNode));
@@ -627,16 +628,46 @@ namespace Konclude {
627628
}
628629

629630

630-
CRulePropertyAtomTermExpression* CXMLOWL2StreamHandler::parseRuleObjectPropertyAtomNode(CStreamParseStackObject* parseStackObj) {
631-
CRulePropertyAtomTermExpression* rulePropertyAtomExp = nullptr;
631+
CRuleAtomTermExpression* CXMLOWL2StreamHandler::parseRuleObjectPropertyAtomNode(CStreamParseStackObject* parseStackObj) {
632+
CRuleAtomTermExpression* ruleAtomExp = nullptr;
632633
if (parseStackObj->hasExpressions()) {
633634
CParsingExpressionSplitter mParsingExpSpl(parseStackObj->getExpressions());
634-
if (mParsingExpSpl.proofExpressionComposition(0,1,0,2,0)) {
635-
rulePropertyAtomExp = new CRulePropertyAtomTermExpression(mParsingExpSpl.getFirstClassVariableTermExpression(),mParsingExpSpl.getSecondClassVariableTermExpression(),mParsingExpSpl.getFirstObjectPropertyTermExpression());
636-
mRuleExpContainer.append(rulePropertyAtomExp);
635+
if (mParsingExpSpl.proofExpressionComposition(0,1,0,1,0)) {
636+
if (mParsingExpSpl.getClassVariableTermExpressionList()->size() >= 2) {
637+
ruleAtomExp = new CRulePropertyAtomTermExpression(mParsingExpSpl.getFirstClassVariableTermExpression(), mParsingExpSpl.getSecondClassVariableTermExpression(), mParsingExpSpl.getFirstObjectPropertyTermExpression());
638+
} else if (!mParsingExpSpl.getIndividualTermExpressionList()->isEmpty()) {
639+
ruleAtomExp = new CRuleClassAtomTermExpression(mOntoBuilder->getObjectHasValue(mParsingExpSpl.getFirstObjectPropertyTermExpression(), mParsingExpSpl.getFirstIndividualTermExpression()), mParsingExpSpl.getFirstClassVariableTermExpression());
640+
} else {
641+
LOG(ERROR, getLogDomain(), logTr("Parsing of possibly unsupported ObjectPropertyAtom failed."), this);
642+
}
643+
if (ruleAtomExp) {
644+
mRuleExpContainer.append(ruleAtomExp);
645+
}
646+
}
647+
}
648+
return ruleAtomExp;
649+
}
650+
651+
652+
653+
CRuleAtomTermExpression* CXMLOWL2StreamHandler::parseRuleDataPropertyAtomNode(CStreamParseStackObject* parseStackObj) {
654+
CRuleClassAtomTermExpression* ruleClassAtomExp = nullptr;
655+
if (parseStackObj->hasExpressions()) {
656+
CParsingExpressionSplitter mParsingExpSpl(parseStackObj->getExpressions());
657+
if (mParsingExpSpl.proofExpressionComposition(0, 0, 0, 1, 0, 1)) {
658+
if (!mParsingExpSpl.getDataRangeTermExpressionList()->isEmpty()) {
659+
ruleClassAtomExp = new CRuleClassAtomTermExpression(mOntoBuilder->getDataSomeValuesFrom(mParsingExpSpl.getFirstDataPropertyTermExpression(), mParsingExpSpl.getFirstDataRangeTermExpression()), mParsingExpSpl.getFirstClassVariableTermExpression());
660+
} else if (!mParsingExpSpl.getDataLiteralTermExpressionList()->isEmpty()) {
661+
ruleClassAtomExp = new CRuleClassAtomTermExpression(mOntoBuilder->getDataHasValue(mParsingExpSpl.getFirstDataPropertyTermExpression(), mParsingExpSpl.getFirstDataLiteralTermExpression()), mParsingExpSpl.getFirstClassVariableTermExpression());
662+
} else {
663+
LOG(ERROR, getLogDomain(), logTr("Parsing of possibly unsupported DataPropertyAtom failed."), this);
664+
}
665+
if (ruleClassAtomExp) {
666+
mRuleExpContainer.append(ruleClassAtomExp);
667+
}
637668
}
638669
}
639-
return rulePropertyAtomExp;
670+
return ruleClassAtomExp;
640671
}
641672

642673
CRuleClassAtomTermExpression* CXMLOWL2StreamHandler::parseRuleClassAtomNode(CStreamParseStackObject* parseStackObj) {
@@ -1631,10 +1662,14 @@ namespace Konclude {
16311662
parseRuleNode(parseStackObj);
16321663
}
16331664

1634-
void CXMLOWL2StreamHandler::jumpFunctionParseRulePropertyAtomNode(CStreamParseStackObject* parseStackObj) {
1665+
void CXMLOWL2StreamHandler::jumpFunctionParseRuleObjectPropertyAtomNode(CStreamParseStackObject* parseStackObj) {
16351666
addTemporaryBuildExpression(parseRuleObjectPropertyAtomNode(parseStackObj));
16361667
}
16371668

1669+
void CXMLOWL2StreamHandler::jumpFunctionParseRuleDataPropertyAtomNode(CStreamParseStackObject* parseStackObj) {
1670+
addTemporaryBuildExpression(parseRuleDataPropertyAtomNode(parseStackObj));
1671+
}
1672+
16381673
void CXMLOWL2StreamHandler::jumpFunctionParseRuleClassAtomNode(CStreamParseStackObject* parseStackObj) {
16391674
addTemporaryBuildExpression(parseRuleClassAtomNode(parseStackObj));
16401675
}

‎Source/Parser/CXMLOWL2StreamHandler.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ namespace Konclude {
278278

279279

280280

281-
CRulePropertyAtomTermExpression* parseRuleObjectPropertyAtomNode(CStreamParseStackObject* parseStackObj);
281+
CRuleAtomTermExpression* parseRuleObjectPropertyAtomNode(CStreamParseStackObject* parseStackObj);
282+
CRuleAtomTermExpression* parseRuleDataPropertyAtomNode(CStreamParseStackObject* parseStackObj);
282283
CRuleClassAtomTermExpression* parseRuleClassAtomNode(CStreamParseStackObject* parseStackObj);
283284
CRuleAtomListBodyExpression* parseRuleAtomBodyNode(CStreamParseStackObject* parseStackObj);
284285
CRuleAtomListHeadExpression* parseRuleAtomHeadNode(CStreamParseStackObject* parseStackObj);
@@ -316,7 +317,8 @@ namespace Konclude {
316317
void jumpFunctionOntologyNode(CStreamParseStackObject* parseStackObj);
317318

318319
void jumpFunctionParseRuleNode(CStreamParseStackObject* parseStackObj);
319-
void jumpFunctionParseRulePropertyAtomNode(CStreamParseStackObject* parseStackObj);
320+
void jumpFunctionParseRuleObjectPropertyAtomNode(CStreamParseStackObject* parseStackObj);
321+
void jumpFunctionParseRuleDataPropertyAtomNode(CStreamParseStackObject* parseStackObj);
320322
void jumpFunctionParseRuleClassAtomNode(CStreamParseStackObject* parseStackObj);
321323
void jumpFunctionParseDifferentIndividualsAtomNode(CStreamParseStackObject* parseStackObj);
322324

‎Source/Reasoner/Classifier/CClassificationManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ namespace Konclude {
102102
foreach (CSubsumptionClassifier *classifier, mOntoClassifierSet) {
103103
CClassificationProgress* classificationProgress = classifier->getClassificationProgress();
104104
if (classificationProgress) {
105-
newClassProg.setTotalClasses(newClassProg.getTotalClasses()+classificationProgress->getTotalClasses());
105+
newClassProg.setTotalSatisfiable(newClassProg.getTotalSatisfiable()+classificationProgress->getTotalSatisfiable());
106106
newClassProg.setClassificationCount(newClassProg.getClassificationCount()+classificationProgress->getClassificationCount());
107-
newClassProg.setTestedClasses(newClassProg.getTestedClasses()+classificationProgress->getTestedClasses());
107+
newClassProg.setTestedSatisfiable(newClassProg.getTestedSatisfiable()+classificationProgress->getTestedSatisfiable());
108108
newClassProg.setTestedSubsumptions(newClassProg.getTestedSubsumptions()+classificationProgress->getTestedSubsumptions());
109109
newClassProg.setTotalSubsumptions(newClassProg.getTotalSubsumptions()+classificationProgress->getTotalSubsumptions());
110110
newClassProg.setRemainingMilliSeconds(qMax(newClassProg.getRemainingMilliSeconds(),classificationProgress->getRemainingMilliSeconds()));

‎Source/Reasoner/Classifier/CClassificationProgress.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ namespace Konclude {
3737
return mClassificationCount;
3838
}
3939

40-
qint64 CClassificationProgress::getTestedClasses() {
40+
qint64 CClassificationProgress::getTestedSatisfiable() {
4141
return mTestedClasses;
4242
}
4343

44-
qint64 CClassificationProgress::getTotalClasses() {
44+
qint64 CClassificationProgress::getTotalSatisfiable() {
4545
return mTotalClasses;
4646
}
4747

@@ -67,12 +67,12 @@ namespace Konclude {
6767
return this;
6868
}
6969

70-
CClassificationProgress *CClassificationProgress::setTestedClasses(qint64 testedClasses) {
70+
CClassificationProgress *CClassificationProgress::setTestedSatisfiable(qint64 testedClasses) {
7171
mTestedClasses = testedClasses;
7272
return this;
7373
}
7474

75-
CClassificationProgress *CClassificationProgress::setTotalClasses(qint64 totalClasses) {
75+
CClassificationProgress *CClassificationProgress::setTotalSatisfiable(qint64 totalClasses) {
7676
mTotalClasses = totalClasses;
7777
return this;
7878
}

‎Source/Reasoner/Classifier/CClassificationProgress.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ namespace Konclude {
5555
CClassificationProgress();
5656

5757
qint64 getClassificationCount();
58-
qint64 getTestedClasses();
59-
qint64 getTotalClasses();
58+
qint64 getTestedSatisfiable();
59+
qint64 getTotalSatisfiable();
6060
qint64 getTestedSubsumptions();
6161
qint64 getTotalSubsumptions();
6262
double getRemainingMilliSeconds();
6363
double getProgessPercent();
6464

6565
CClassificationProgress *setClassificationCount(qint64 classificationCount);
66-
CClassificationProgress *setTestedClasses(qint64 testedClasses);
67-
CClassificationProgress *setTotalClasses(qint64 totalClasses);
66+
CClassificationProgress *setTestedSatisfiable(qint64 testedClasses);
67+
CClassificationProgress *setTotalSatisfiable(qint64 totalClasses);
6868
CClassificationProgress *setTestedSubsumptions(qint64 testedSubsumptions);
6969
CClassificationProgress *setTotalSubsumptions(qint64 totalSubsumptions);
7070
CClassificationProgress *setRemainingMilliSeconds(double remainingMilliSeconds);

‎Source/Reasoner/Classifier/COptimizedClassExtractedSaturationSubsumptionClassifierThread.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,13 @@ namespace Konclude {
225225
mClassifyProgess.setClassificationCount(classificCount);
226226
mClassifyProgess.setProgessPercent(progessPercent);
227227
mClassifyProgess.setRemainingMilliSeconds(remainingMilliSeconds);
228-
mClassifyProgess.setTestedClasses(testedClasses);
229-
mClassifyProgess.setTotalClasses(totalClasses);
228+
mClassifyProgess.setTestedSatisfiable(testedClasses);
229+
mClassifyProgess.setTotalSatisfiable(totalClasses);
230230
} else {
231231
mClassifyProgess.setProgessPercent(0.);
232232
mClassifyProgess.setRemainingMilliSeconds(0.);
233-
mClassifyProgess.setTestedClasses(satTestedCount);
234-
mClassifyProgess.setTotalClasses(totalToTestCount);
233+
mClassifyProgess.setTestedSatisfiable(satTestedCount);
234+
mClassifyProgess.setTotalSatisfiable(totalToTestCount);
235235
}
236236
return &mClassifyProgess;
237237
}

0 commit comments

Comments
 (0)