aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/uk/ac/ox
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/uk/ac/ox')
-rw-r--r--src/main/java/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java3
-rw-r--r--src/main/java/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java9
-rw-r--r--src/main/java/uk/ac/ox/cs/pagoda/rules/LowerDatalogProgram.java5
-rw-r--r--src/main/java/uk/ac/ox/cs/pagoda/rules/Program.java2
4 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java b/src/main/java/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java
index ac62488..ebf1960 100644
--- a/src/main/java/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java
+++ b/src/main/java/uk/ac/ox/cs/pagoda/reasoner/HermiTReasoner.java
@@ -1,5 +1,6 @@
1package uk.ac.ox.cs.pagoda.reasoner; 1package uk.ac.ox.cs.pagoda.reasoner;
2 2
3import org.semanticweb.HermiT.Configuration;
3import org.semanticweb.HermiT.Reasoner; 4import org.semanticweb.HermiT.Reasoner;
4import org.semanticweb.owlapi.model.*; 5import org.semanticweb.owlapi.model.*;
5import uk.ac.ox.cs.JRDFox.model.Individual; 6import uk.ac.ox.cs.JRDFox.model.Individual;
@@ -63,7 +64,7 @@ class HermiTReasoner extends QueryReasoner {
63 factory = onto.getOWLOntologyManager().getOWLDataFactory(); 64 factory = onto.getOWLOntologyManager().getOWLDataFactory();
64 roller = new QueryRoller(factory); 65 roller = new QueryRoller(factory);
65 66
66 hermit = new Reasoner(onto); 67 hermit = new Reasoner(new Configuration(), onto);
67 return isConsistent(); 68 return isConsistent();
68 } 69 }
69 70
diff --git a/src/main/java/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java b/src/main/java/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java
index 3f3c22d..fb7e062 100644
--- a/src/main/java/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java
+++ b/src/main/java/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java
@@ -1,5 +1,6 @@
1package uk.ac.ox.cs.pagoda.reasoner.full; 1package uk.ac.ox.cs.pagoda.reasoner.full;
2 2
3import org.semanticweb.HermiT.Configuration;
3import org.semanticweb.HermiT.Reasoner; 4import org.semanticweb.HermiT.Reasoner;
4import org.semanticweb.HermiT.model.DLClause; 5import org.semanticweb.HermiT.model.DLClause;
5import org.semanticweb.HermiT.model.Term; 6import org.semanticweb.HermiT.model.Term;
@@ -57,7 +58,7 @@ public class HermitChecker extends Checker {
57// record = other.record; 58// record = other.record;
58 } 59 }
59 60
60 hermit = new Reasoner(ontology); 61 hermit = new Reasoner(new Configuration(), ontology);
61 } 62 }
62 63
63 public HermitChecker(OWLOntology ontology, QueryRecord record, boolean toCheck) { 64 public HermitChecker(OWLOntology ontology, QueryRecord record, boolean toCheck) {
@@ -174,12 +175,12 @@ public class HermitChecker extends Checker {
174 addTopAndBotTuple(topAxioms, botAxioms); 175 addTopAndBotTuple(topAxioms, botAxioms);
175 manager.addAxioms(ontology, topAxioms); 176 manager.addAxioms(ontology, topAxioms);
176 manager.addAxioms(ontology, botAxioms); 177 manager.addAxioms(ontology, botAxioms);
177 hermit = new Reasoner(ontology); 178 hermit = new Reasoner(new Configuration(), ontology);
178 boolean topValid = true; 179 boolean topValid = true;
179 if(!hermit.isConsistent() || topAnswerTuple != null && (topValid = check(topAnswerTuple))) { 180 if(!hermit.isConsistent() || topAnswerTuple != null && (topValid = check(topAnswerTuple))) {
180 hermit.dispose(); 181 hermit.dispose();
181 manager.removeAxioms(ontology, topAxioms); 182 manager.removeAxioms(ontology, topAxioms);
182 hermit = new Reasoner(ontology); 183 hermit = new Reasoner(new Configuration(), ontology);
183 } 184 }
184 else { 185 else {
185 if(!topValid) tag = -1; 186 if(!topValid) tag = -1;
@@ -187,7 +188,7 @@ public class HermitChecker extends Checker {
187 } 188 }
188 } 189 }
189 else 190 else
190 hermit = new Reasoner(ontology); 191 hermit = new Reasoner(new Configuration(), ontology);
191 } 192 }
192 193
193 private void addTopAndBotTuple(Set<OWLAxiom> topAxioms, Set<OWLAxiom> botAxioms) { 194 private void addTopAndBotTuple(Set<OWLAxiom> topAxioms, Set<OWLAxiom> botAxioms) {
diff --git a/src/main/java/uk/ac/ox/cs/pagoda/rules/LowerDatalogProgram.java b/src/main/java/uk/ac/ox/cs/pagoda/rules/LowerDatalogProgram.java
index a2676e8..2610652 100644
--- a/src/main/java/uk/ac/ox/cs/pagoda/rules/LowerDatalogProgram.java
+++ b/src/main/java/uk/ac/ox/cs/pagoda/rules/LowerDatalogProgram.java
@@ -1,6 +1,7 @@
1package uk.ac.ox.cs.pagoda.rules; 1package uk.ac.ox.cs.pagoda.rules;
2 2
3import org.apache.commons.io.FilenameUtils; 3import org.apache.commons.io.FilenameUtils;
4import org.semanticweb.HermiT.Configuration;
4import org.semanticweb.HermiT.Reasoner; 5import org.semanticweb.HermiT.Reasoner;
5import org.semanticweb.HermiT.model.*; 6import org.semanticweb.HermiT.model.*;
6import org.semanticweb.owlapi.model.*; 7import org.semanticweb.owlapi.model.*;
@@ -149,7 +150,7 @@ class ClassifyThread extends Thread {
149 public void run() { 150 public void run() {
150 ontology = m_program.getOntology(); 151 ontology = m_program.getOntology();
151 try { 152 try {
152 hermitReasoner = new Reasoner(ontology); 153 hermitReasoner = new Reasoner(new Configuration(), ontology);
153 Timer t = new Timer(); 154 Timer t = new Timer();
154 hermitReasoner.classifyClasses(); 155 hermitReasoner.classifyClasses();
155 Utility.logInfo("HermiT classification done: " + t.duration()); 156 Utility.logInfo("HermiT classification done: " + t.duration());
@@ -235,4 +236,4 @@ class ClassifyThread extends Thread {
235 private Atom getAtom(OWLClass c) { 236 private Atom getAtom(OWLClass c) {
236 return Atom.create(AtomicConcept.create(c.toStringID()), X); 237 return Atom.create(AtomicConcept.create(c.toStringID()), X);
237 } 238 }
238} \ No newline at end of file 239}
diff --git a/src/main/java/uk/ac/ox/cs/pagoda/rules/Program.java b/src/main/java/uk/ac/ox/cs/pagoda/rules/Program.java
index de06f52..22eb9ec 100644
--- a/src/main/java/uk/ac/ox/cs/pagoda/rules/Program.java
+++ b/src/main/java/uk/ac/ox/cs/pagoda/rules/Program.java
@@ -273,7 +273,7 @@ protected PredicateDependency dependencyGraph;
273 Utility.logInfo("The number of data property range axioms that are ignored: " + noOfDataPropertyRangeAxioms + "(" + noOfAxioms + ")"); 273 Utility.logInfo("The number of data property range axioms that are ignored: " + noOfDataPropertyRangeAxioms + "(" + noOfAxioms + ")");
274 274
275 DLOntology dlOntology = (DLOntology) clausifier.preprocessAndClausify(filteredOntology, null)[1]; 275 DLOntology dlOntology = (DLOntology) clausifier.preprocessAndClausify(filteredOntology, null)[1];
276 dlClauses = dlOntology.getDLClauses(); 276 dlClauses = new HashSet<DLClause>(dlOntology.getDLClauses());
277 positiveFacts = dlOntology.getPositiveFacts(); 277 positiveFacts = dlOntology.getPositiveFacts();
278 } 278 }
279 279