The LimitedSkolemisation now employs a fixed-depth term instead of a constant. Performed some testing before merging with master.

4 files changed, 6 insertions, 5 deletions

diff --git a/test/resources/BugTests.xml b/test/resources/BugTests.xml
index 1413b5b..4844fbe 100644
--- a/test/resources/BugTests.xml
+++ b/test/resources/BugTests.xml
@@ -6,7 +6,7 @@
     <test name="BugTest">
         <classes>
             <class name="uk.ac.ox.cs.pagoda.global_tests.BugTests"/>
-            <!--<class name="uk.ac.ox.cs.pagoda.endomorph.DependencyGraphTest"/>-->
+            <class name="uk.ac.ox.cs.pagoda.endomorph.DependencyGraphTest"/>
         </classes>
     </test>
 
diff --git a/test/resources/MainTests.xml b/test/resources/MainTests.xml
index 255b68e..43300a1 100644
--- a/test/resources/MainTests.xml
+++ b/test/resources/MainTests.xml
@@ -7,9 +7,9 @@
             <run>
                 <!--<include name="correctness"/>-->
                 <!--<include name="light"/>-->
-                <!--<include name="justExecute"/>-->
+                <include name="justExecute"/>
                 <!--&lt;!&ndash;<include name="heavy"/>&ndash;&gt;-->
-                <include name="nonOriginal"/>
+                <!--<include name="nonOriginal"/>-->
             </run>
         </groups>
         <classes>
diff --git a/test/uk/ac/ox/cs/pagoda/endomorph/DependencyGraphTest.java b/test/uk/ac/ox/cs/pagoda/endomorph/DependencyGraphTest.java
index eec1e8f..a4579a3 100644
--- a/test/uk/ac/ox/cs/pagoda/endomorph/DependencyGraphTest.java
+++ b/test/uk/ac/ox/cs/pagoda/endomorph/DependencyGraphTest.java
@@ -2,6 +2,7 @@ package uk.ac.ox.cs.pagoda.endomorph;
 
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.*;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 import uk.ac.ox.cs.JRDFox.model.GroundTerm;
 import uk.ac.ox.cs.JRDFox.model.Individual;
@@ -54,6 +55,6 @@ public class DependencyGraphTest {
 
         dependencyGraph.build(tuples);
 
-        System.out.println(dependencyGraph.getTopologicalOrder());
+        Assert.assertTrue(dependencyGraph.getTopologicalOrder().size() >= 2);
     }
 }
diff --git a/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaFLY.java b/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaFLY.java
index a7a562d..42f0ac1 100644
--- a/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaFLY.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaFLY.java
@@ -62,7 +62,7 @@ public class TestPagodaFLY {
 //                        .answer(Paths.get("/home/alessandro/Desktop/answers.json"))
                 .classify(false)
                 .hermit(true)
-                .skolem(PagodaProperties.SkolemUpperBoundOptions.AFTER_SUMMARISATION)
+                .skolem(PagodaProperties.SkolemUpperBoundOptions.BEFORE_SUMMARISATION)
                 .build()
                 .run();
     }