Internalisation: added condition for existential variables (classes HermitChecker and QueryGraph).

Answer dependencies: found bug, trying to solve; excluding dependency analysis solve the problem.

2 files changed, 63 insertions, 5 deletions

diff --git a/test/resources/MainTests.xml b/test/resources/MainTests.xml
index cfe6184..db8d977 100644
--- a/test/resources/MainTests.xml
+++ b/test/resources/MainTests.xml
@@ -5,17 +5,17 @@
     <test name="main">
         <groups>
             <run>
-                <!--<include name="correctness"/>-->
+                <include name="correctness"/>
                 <!--<include name="light"/>-->
                 <!--<include name="justExecute"/>-->
                 <!--&lt;!&ndash;<include name="heavy"/>&ndash;&gt;-->
-                <include name="nonOriginal"/>
+                <!--<include name="nonOriginal"/>-->
             </run>
         </groups>
         <classes>
             <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaReactome"/>-->
-            <class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaUOBM"/>
-            <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaLUBM"/>-->
+            <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaUOBM"/>-->
+            <class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaLUBM"/>
             <!--Fly does not terminate: query-5 looks really hard-->
             <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaFLY"/>-->
             <!--<class name="uk.ac.ox.cs.pagoda.global_tests.SkolemisationTests"/>-->
diff --git a/test/uk/ac/ox/cs/pagoda/global_tests/BugTests.java b/test/uk/ac/ox/cs/pagoda/global_tests/BugTests.java
index 19e0b2a..6e60e24 100644
--- a/test/uk/ac/ox/cs/pagoda/global_tests/BugTests.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/BugTests.java
@@ -23,6 +23,64 @@ public class BugTests {
     }
 
     @Test
+    public void minimumCardinalityAxiom2() throws OWLOntologyCreationException, IOException, OWLOntologyStorageException {
+
+        /*
+         * Build test ontology
+         * */
+
+        OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
+        OWLDataFactory factory = manager.getOWLDataFactory();
+        OWLOntology ontology = manager.createOntology();
+
+//        OWLClass student = factory.getOWLClass(getEntityIRI("Student"));
+//        manager.addAxiom(ontology, factory.getOWLDeclarationAxiom(student));
+//        OWLClass course = factory.getOWLClass(getEntityIRI("Course"));
+//        manager.addAxiom(ontology, factory.getOWLDeclarationAxiom(course));
+        OWLClass hardWorkingStudent = factory.getOWLClass(getEntityIRI("HardWorkingStudent"));
+        manager.addAxiom(ontology, factory.getOWLDeclarationAxiom(hardWorkingStudent));
+        OWLNamedIndividual a = factory.getOWLNamedIndividual(getEntityIRI("a"));
+        OWLNamedIndividual b = factory.getOWLNamedIndividual(getEntityIRI("b"));
+        OWLObjectProperty takesCourse = factory.getOWLObjectProperty(IRI.create(String.format(NS, "takesCourse")));
+        manager.addAxiom(ontology, factory.getOWLDeclarationAxiom(takesCourse));
+
+        // Class assertions
+        manager.addAxiom(ontology, factory.getOWLClassAssertionAxiom(hardWorkingStudent, a));   // HardWorkingStudent(a)
+        manager.addAxiom(ontology, factory.getOWLClassAssertionAxiom(hardWorkingStudent, b));   // HardWorkingStudent(b)
+
+        // Minimum cardinality axiom
+        manager.addAxiom(ontology,
+                factory.getOWLEquivalentClassesAxiom(hardWorkingStudent,
+                        factory.getOWLObjectMinCardinality(3,
+                                takesCourse)));
+
+//        manager.saveOntology(ontology, Files.newOutputStream(Paths.get("/home/alessandro/Desktop/test-ontology.owl")));
+
+        /*
+         * Test one query
+         * */
+
+        QueryReasoner pagoda = QueryReasoner.getInstance(ontology);
+        pagoda.loadOntology(ontology);
+        if (pagoda.preprocess()) {
+            String query = "select distinct ?x ?y " +
+                    " where { "
+                    + " ?x <" + takesCourse.toStringID() + "> _:z . "
+                    + " ?y <" + takesCourse.toStringID() + "> _:z " +
+                    " }";
+            AnswerTuples answers = pagoda.evaluate(query);
+            int count = 0;
+            for (AnswerTuple ans; answers.isValid(); answers.moveNext()) {
+                ans = answers.getTuple();
+                TestUtil.logInfo(ans);
+                count++;
+            }
+            Assert.assertEquals(count, 2);
+        }
+        pagoda.dispose();
+    }
+
+//    @Test
     public void minimumCardinalityAxiom() throws OWLOntologyCreationException, IOException, OWLOntologyStorageException {
 
         /*
@@ -107,7 +165,7 @@ public class BugTests {
      * @throws IOException
      * @throws OWLOntologyStorageException
      */
-    @Test
+//    @Test
     public void rTest() throws OWLOntologyCreationException, IOException, OWLOntologyStorageException {
 
         /*