3 files changed, 35 insertions, 29 deletions

diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/ConsistencyManager.java b/src/uk/ac/ox/cs/pagoda/reasoner/ConsistencyManager.java
index 7d3e40c..63fe246 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/ConsistencyManager.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/ConsistencyManager.java
@@ -108,7 +108,7 @@ public class ConsistencyManager {
                 } catch (OWLOntologyCreationException e) {
                         e.printStackTrace();
                 }
-                fullQueryRecord.saveRelevantClause();
+//              fullQueryRecord.saveRelevantClause();
                 
                 boolean satisfiability; 
                 
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
index 875dcdd..17838ae 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
@@ -296,13 +296,14 @@ public class MyQueryReasoner extends QueryReasoner {
                 
                 Timer t = new Timer(); 
                 Checker summarisedChecker = new HermitSummaryFilter(queryRecord, properties.getToCallHermiT()); 
-                int validNumber = summarisedChecker.check(queryRecord.getGapAnswers()); 
+//              int validNumber = 
+                summarisedChecker.check(queryRecord.getGapAnswers()); 
                 summarisedChecker.dispose();
                 Utility.logDebug("Total time for full reasoner: " + t.duration());
-                if (validNumber == 0) { 
+//              if (validNumber == 0) { 
                         queryRecord.markAsProcessed(); 
                         Utility.logDebug("Difficulty of this query: " + queryRecord.getDifficulty());
-                }
+//              }
         }
         
         @Override
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java b/src/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java
index 97925fc..4dd11d8 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java
@@ -77,7 +77,8 @@ public class HermitChecker implements Checker {
         }
         
         private int tag = 0;
-        AnswerTuple topAnswerTuple = null, botAnswerTuple = null; 
+//      AnswerTuple topAnswerTuple = null; 
+        AnswerTuple botAnswerTuple = null; 
         
         private void initialiseReasoner() {
                 qGraph = new QueryGraph(queryClause.getBodyAtoms(), answerVariable[1], ontology); 
@@ -96,8 +97,9 @@ public class HermitChecker implements Checker {
                                 manager.removeAxioms(ontology, axioms); 
                                 hermit = new Reasoner(ontology); 
                         } else {
-                                if (topAnswerTuple != null && !check(topAnswerTuple)) tag = -1; 
-                                else if (botAnswerTuple != null && check(botAnswerTuple)) tag = 1; 
+//                              if (topAnswerTuple != null && !check(topAnswerTuple)) tag = -1; 
+//                              else 
+                                        if (botAnswerTuple != null && check(botAnswerTuple)) tag = 1; 
                         }
                 }
                 else 
@@ -105,19 +107,22 @@ public class HermitChecker implements Checker {
         }
         
         private void addTopAndBotTuple(Set<OWLAxiom> axioms) {
-                String top_str = Namespace.PAGODA_ANONY + "top", bot_str = Namespace.PAGODA_ANONY + "bot";
-                topAnswerTuple = new AnswerTuple(new uk.ac.ox.cs.JRDFox.model.Individual[] { uk.ac.ox.cs.JRDFox.model.Individual.create(top_str) } ); 
+//              String top_str = Namespace.PAGODA_ANONY + "top";
+                String bot_str = Namespace.PAGODA_ANONY + "bot";
+//              topAnswerTuple = new AnswerTuple(new uk.ac.ox.cs.JRDFox.model.Individual[] { uk.ac.ox.cs.JRDFox.model.Individual.create(top_str) } ); 
                 botAnswerTuple = new AnswerTuple(new uk.ac.ox.cs.JRDFox.model.Individual[] { uk.ac.ox.cs.JRDFox.model.Individual.create(bot_str) } );  
-                OWLIndividual top_ind = factory.getOWLNamedIndividual(IRI.create(top_str)), bot_ind = factory.getOWLNamedIndividual(IRI.create(bot_str));
+//              OWLIndividual top_ind = factory.getOWLNamedIndividual(IRI.create(top_str));
+                OWLIndividual bot_ind = factory.getOWLNamedIndividual(IRI.create(bot_str));
                 Map<OWLAxiom, Integer> counter = new HashMap<OWLAxiom, Integer>(); 
                 
-                Set<String> topAnswers = new HashSet<String>(), botAnswers = new HashSet<String>();
+//              Set<String> topAnswers = new HashSet<String>();
+                Set<String> botAnswers = new HashSet<String>();
                 OWLIndividual sub, obj; 
-                if (dGraph.getExits().size() > 1) {
-                        for (Clique answerClique: dGraph.getExits())  
-                                topAnswers.add(((uk.ac.ox.cs.JRDFox.model.Individual) answerClique.getRepresentative().getAnswerTuple().getGroundTerm(0)).getIRI());
-                }
-                else topAnswerTuple = null; 
+//              if (dGraph.getExits().size() > 1) {
+//                      for (Clique answerClique: dGraph.getExits())  
+//                              topAnswers.add(((uk.ac.ox.cs.JRDFox.model.Individual) answerClique.getRepresentative().getAnswerTuple().getGroundTerm(0)).getIRI());
+//              }
+//              else topAnswerTuple = null; 
                 
                 if (dGraph.getEntrances().size() > 1) {
                         for (Clique answerClique: dGraph.getEntrances()) 
@@ -129,23 +134,23 @@ public class HermitChecker implements Checker {
                         if (axiom instanceof OWLClassAssertionAxiom) {
                                 OWLClassAssertionAxiom ca = (OWLClassAssertionAxiom) axiom;
                                 sub = ca.getIndividual();
-                                if (topAnswers.contains(sub.toStringID())) 
-                                        axioms.add(factory.getOWLClassAssertionAxiom(ca.getClassExpression(), top_ind));
+//                              if (topAnswers.contains(sub.toStringID())) 
+//                                      axioms.add(factory.getOWLClassAssertionAxiom(ca.getClassExpression(), top_ind));
                                 if (botAnswers.contains(sub.toStringID())) 
                                         inc(counter, factory.getOWLClassAssertionAxiom(ca.getClassExpression(), bot_ind));
                         }
                         else if (axiom instanceof OWLObjectPropertyAssertionAxiom) {
                                 OWLObjectPropertyAssertionAxiom oa = (OWLObjectPropertyAssertionAxiom) axiom; 
                                 sub = oa.getSubject(); obj = oa.getObject(); 
-                                if (topAnswers.contains(sub.toStringID()))
-                                        if (topAnswers.contains(obj.toStringID()))
-                                                axioms.add(factory.getOWLObjectPropertyAssertionAxiom(oa.getProperty(), top_ind, top_ind));
-                                        else 
-                                                axioms.add(factory.getOWLObjectPropertyAssertionAxiom(oa.getProperty(), top_ind, obj));
-                                else {
-                                        if (topAnswers.contains(obj.toStringID()))
-                                                axioms.add(factory.getOWLObjectPropertyAssertionAxiom(oa.getProperty(), sub, top_ind));
-                                }
+////                            if (topAnswers.contains(sub.toStringID()))
+////                                    if (topAnswers.contains(obj.toStringID()))
+////                                            axioms.add(factory.getOWLObjectPropertyAssertionAxiom(oa.getProperty(), top_ind, top_ind));
+////                                    else 
+////                                            axioms.add(factory.getOWLObjectPropertyAssertionAxiom(oa.getProperty(), top_ind, obj));
+////                            else {
+////                                    if (topAnswers.contains(obj.toStringID()))
+////                                            axioms.add(factory.getOWLObjectPropertyAssertionAxiom(oa.getProperty(), sub, top_ind));
+////                            }
                                 
                                 if (botAnswers.contains(sub.toStringID()))
                                         if (botAnswers.contains(obj.toStringID()))
@@ -161,8 +166,8 @@ public class HermitChecker implements Checker {
                         else if (axiom instanceof OWLDataPropertyAssertionAxiom) {
                                 OWLDataPropertyAssertionAxiom da = (OWLDataPropertyAssertionAxiom) axiom; 
                                 sub = da.getSubject(); 
-                                if (topAnswers.contains(sub.toStringID())) 
-                                        axioms.add(factory.getOWLDataPropertyAssertionAxiom(da.getProperty(), top_ind, da.getObject()));
+//                              if (topAnswers.contains(sub.toStringID())) 
+//                                      axioms.add(factory.getOWLDataPropertyAssertionAxiom(da.getProperty(), top_ind, da.getObject()));
                                 
                                 if (botAnswers.contains(sub.toStringID())) 
                                         inc(counter, factory.getOWLDataPropertyAssertionAxiom(da.getProperty(), bot_ind, da.getObject()));