Incremental Skolemised store (not working).

2 files changed, 31 insertions, 17 deletions

diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
index 71d5752..a393474 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
@@ -396,24 +396,31 @@ class MyQueryReasoner extends QueryReasoner {
         relevantStore.importDataFromABoxOf(relevantSubset);
         String relevantOriginalMarkProgram = OWLHelper.getOriginalMarkProgram(relevantSubset);
 
-        int queryDependentMaxTermDepth = properties.getSkolemDepth();
         relevantStore.materialise("Mark original individuals", relevantOriginalMarkProgram);
-        int materialisationTag = relevantStore.materialiseSkolemly(relevantProgram, null,
-                                                                   queryDependentMaxTermDepth);
-        queryRecord.addProcessingTime(Step.SKOLEM_UPPER_BOUND, t.duration());
-        if(materialisationTag == -1) {
-            throw new Error("A consistent ontology has turned out to be " +
-                                    "inconsistent in the Skolemises-relevant-upper-store");
-        }
-        else if(materialisationTag != 1) {
-            Utility.logInfo("Semi-Skolemised relevant upper store cannot be employed");
-            return false;
-        }
 
-        Utility.logInfo("Querying semi-Skolemised upper store...");
-        boolean isFullyProcessed = queryUpperStore(relevantStore, queryRecord,
-                                                   queryRecord.getExtendedQueryText(),
-                                                   Step.SKOLEM_UPPER_BOUND);
+        boolean isFullyProcessed = false;
+        for (int currentMaxTermDepth = 1;
+             currentMaxTermDepth <= properties.getSkolemDepth() && !isFullyProcessed; currentMaxTermDepth++) {
+
+            Utility.logInfo("Trying with maximum depth " + currentMaxTermDepth);
+
+            int materialisationTag = relevantStore.materialiseSkolemly(relevantProgram, null,
+                    currentMaxTermDepth);
+            queryRecord.addProcessingTime(Step.SKOLEM_UPPER_BOUND, t.duration());
+            if(materialisationTag == -1) {
+                throw new Error("A consistent ontology has turned out to be " +
+                                        "inconsistent in the Skolemises-relevant-upper-store");
+            }
+            else if(materialisationTag != 1) {
+                Utility.logInfo("Semi-Skolemised relevant upper store cannot be employed");
+                return false;
+            }
+
+            Utility.logInfo("Querying semi-Skolemised upper store...");
+            isFullyProcessed = queryUpperStore(relevantStore, queryRecord,
+                                                       queryRecord.getExtendedQueryText(),
+                                                       Step.SKOLEM_UPPER_BOUND);
+        }
 
         relevantStore.dispose();
         Utility.logInfo("Semi-Skolemised relevant upper store has been evaluated");
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/light/RDFoxTripleManager.java b/src/uk/ac/ox/cs/pagoda/reasoner/light/RDFoxTripleManager.java
index 85f8ef9..62885be 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/light/RDFoxTripleManager.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/light/RDFoxTripleManager.java
@@ -93,6 +93,14 @@ public class RDFoxTripleManager {
                         e.printStackTrace();
                 } 
         }
+
+    public void removeTripleByTermIncrementally(Atom atom) {
+        try {
+            m_store.addTriples(getRDFoxTriple(atom), UpdateType.ScheduleForDeletion);
+        } catch (JRDFStoreException e) {
+            e.printStackTrace();
+        }
+    }
         
         public static GroundTerm[] getRDFoxTriple(Atom instance) {
                 if (instance.getArity() == 1) 
@@ -258,5 +266,4 @@ public class RDFoxTripleManager {
                 else 
                         return "\"" + r.m_lexicalForm + "\"^^<" + r.m_datatype.getIRI() + ">"; 
         }
-        
 }