aboutsummaryrefslogtreecommitdiff
path: root/src/uk/ac/ox/cs/pagoda/reasoner
diff options
context:
space:
mode:
authorRncLsn <rnc.lsn@gmail.com>2015-08-04 18:30:46 +0100
committerRncLsn <rnc.lsn@gmail.com>2015-08-04 18:30:46 +0100
commitc3480bb733b8bca976718a3dc2f09a21cb4b1b45 (patch)
tree648b2dacb4b162205d26856c4be4bb7389f99141 /src/uk/ac/ox/cs/pagoda/reasoner
parent0c39145b3b76b3db73db0a38d5324caa7ff3c434 (diff)
downloadACQuA-c3480bb733b8bca976718a3dc2f09a21cb4b1b45.tar.gz
ACQuA-c3480bb733b8bca976718a3dc2f09a21cb4b1b45.zip
Rules parsing.
Diffstat (limited to 'src/uk/ac/ox/cs/pagoda/reasoner')
-rw-r--r--src/uk/ac/ox/cs/pagoda/reasoner/ELHOUQueryReasoner.java2
-rw-r--r--src/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java2
-rw-r--r--src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/ELHOUQueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/ELHOUQueryReasoner.java
index a56a793..15dfa03 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/ELHOUQueryReasoner.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/ELHOUQueryReasoner.java
@@ -117,7 +117,7 @@ class ELHOUQueryReasoner extends QueryReasoner {
117 } 117 }
118 118
119 OWLOntology ontology = o; 119 OWLOntology ontology = o;
120 program = new DatalogProgram(ontology, properties.getToClassify()); 120 program = new DatalogProgram(ontology);
121 121
122 importData(program.getAdditionalDataFile()); 122 importData(program.getAdditionalDataFile());
123 123
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java
index 15eb9e8..ac62488 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java
@@ -52,7 +52,7 @@ class HermiTReasoner extends QueryReasoner {
52 e.printStackTrace(); 52 e.printStackTrace();
53 } 53 }
54 54
55 DatalogProgram datalogProgram = new DatalogProgram(tbox, false); 55 DatalogProgram datalogProgram = new DatalogProgram(tbox);
56 importData(datalogProgram.getAdditionalDataFile()); 56 importData(datalogProgram.getAdditionalDataFile());
57 upperStore = new MultiStageQueryEngine("rl-upper", false); 57 upperStore = new MultiStageQueryEngine("rl-upper", false);
58 upperStore.importRDFData("data", getImportedData()); 58 upperStore.importRDFData("data", getImportedData());
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
index 8e28142..71d5752 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
@@ -68,7 +68,7 @@ class MyQueryReasoner extends QueryReasoner {
68 } 68 }
69 69
70 ontology = o; 70 ontology = o;
71 program = new DatalogProgram(ontology, properties.getToClassify()); 71 program = new DatalogProgram(ontology);
72// program.getLower().save(); 72// program.getLower().save();
73// program.getUpper().save(); 73// program.getUpper().save();
74// program.getGeneral().save(); 74// program.getGeneral().save();
@@ -154,7 +154,7 @@ class MyQueryReasoner extends QueryReasoner {
154// encoder = new TrackingRuleEncoderDisjVar2(program.getUpper(), trackingStore); 154// encoder = new TrackingRuleEncoderDisjVar2(program.getUpper(), trackingStore);
155// encoder = new TrackingRuleEncoderDisj2(program.getUpper(), trackingStore); 155// encoder = new TrackingRuleEncoderDisj2(program.getUpper(), trackingStore);
156 156
157 // TODO add consistency check by Skolem-upper-bound 157 // TODO? add consistency check by Skolem-upper-bound
158 158
159 if(!isConsistent()) 159 if(!isConsistent())
160 return false; 160 return false;
@@ -225,7 +225,7 @@ class MyQueryReasoner extends QueryReasoner {
225 @Override 225 @Override
226 public void evaluateUpper(QueryRecord queryRecord) { 226 public void evaluateUpper(QueryRecord queryRecord) {
227 if(isDisposed()) throw new DisposedException(); 227 if(isDisposed()) throw new DisposedException();
228 // TODO add new upper store 228 // TODO? add new upper store
229 AnswerTuples rlAnswer = null; 229 AnswerTuples rlAnswer = null;
230 boolean useFull = queryRecord.isBottom() || lazyUpperStore == null; 230 boolean useFull = queryRecord.isBottom() || lazyUpperStore == null;
231 try { 231 try {
@@ -388,7 +388,7 @@ class MyQueryReasoner extends QueryReasoner {
388 Utility.logInfo(">> Semi-Skolemisation <<"); 388 Utility.logInfo(">> Semi-Skolemisation <<");
389 t.reset(); 389 t.reset();
390 390
391 DatalogProgram relevantProgram = new DatalogProgram(relevantSubset, false); // toClassify is false 391 DatalogProgram relevantProgram = new DatalogProgram(relevantSubset);
392 392
393 MultiStageQueryEngine relevantStore = 393 MultiStageQueryEngine relevantStore =
394 new MultiStageQueryEngine("Relevant-store", true); // checkValidity is true 394 new MultiStageQueryEngine("Relevant-store", true); // checkValidity is true