Fixed marking original individuals in the relevant upper store.

4 files changed, 99 insertions, 7 deletions

diff --git a/test/resources/ComparisonTests.xml b/test/resources/ComparisonTests.xml
new file mode 100644
index 0000000..0095724
--- /dev/null
+++ b/test/resources/ComparisonTests.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<!--
+Compare different configurations of the system.
+
+Actually it is not a great idea to test performances in this way,
+because all the different configurations are executed on the same JVM.
+-->
+
+<suite name="ComparisonTests">
+    <test name="comparison">
+        <groups>
+            <run>
+                <include name="comparison"/>
+            </run>
+        </groups>
+        <classes>
+            <!--<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.TestPagodaFLY"/>
+        </classes>
+    </test>
+</suite>
\ No newline at end of file
diff --git a/test/resources/LightTests.xml b/test/resources/LightTests.xml
index 859e3fa..8d9a700 100644
--- a/test/resources/LightTests.xml
+++ b/test/resources/LightTests.xml
@@ -5,10 +5,10 @@
     <test name="light">
         <groups>
             <run>
-                <include name="light"/>
+                <!--<include name="light"/>-->
+                <include name="justExecute"/>
             </run>
         </groups>
-
         <classes>
             <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaUOBM"/>-->
             <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaLUBM"/>-->
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 4fdccf8..42827a0 100644
--- a/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaFLY.java
+++ b/test/uk/ac/ox/cs/pagoda/global_tests/TestPagodaFLY.java
@@ -4,6 +4,7 @@ import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.Pagoda;
 import uk.ac.ox.cs.pagoda.query.CheckAnswers;
 import uk.ac.ox.cs.pagoda.util.TestUtil;
+import uk.ac.ox.cs.pagoda.util.Timer;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,8 +21,8 @@ public class TestPagodaFLY {
                 Path givenAnswers = TestUtil.getAnswersFilePath("answers/pagoda-fly-with-GJ-FC-individuals.json");
 
                 Pagoda pagoda = Pagoda.builder()
-                                                          .ontology(TestUtil.combinePaths(ontoDir, "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl"))
-                                              .query(TestUtil.combinePaths(ontoDir, "fly/queries/fly.sparql"))
+                                                          .ontology(Paths.get(ontoDir, "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl"))
+                                                          .query(Paths.get(ontoDir, "fly/queries/fly.sparql"))
                                                           .answer(answers)
                                                           .classify(false)
                                                           .hermit(true)
@@ -39,9 +40,10 @@ public class TestPagodaFLY {
                 Path givenAnswers = TestUtil.getAnswersFilePath("answers/pagoda-fly-rolledup.json");
 
                 Pagoda pagoda = Pagoda.builder()
-                                                          .ontology(TestUtil.combinePaths(ontoDir, "fly/fly_rolledUp.owl"))
-                                                          .query(TestUtil.combinePaths(ontoDir, "fly/queries/fly_rolledUp.sparql"))
+                                                          .ontology(Paths.get(ontoDir, "fly/fly_rolledUp.owl"))
+                                                          .query(Paths.get(ontoDir, "fly/queries/fly_rolledUp.sparql"))
                                                           .answer(answers)
+                                                          .answer(Paths.get("/home/alessandro/Desktop/answers.json"))
                                                           .classify(false)
                                                           .hermit(true)
                                                           .build();
@@ -49,4 +51,54 @@ public class TestPagodaFLY {
                 pagoda.run();
                 CheckAnswers.assertSameAnswers(answers, givenAnswers);
         }
+
+        @Test(groups = {"light", "justExecute"})
+        public void justExecute_newQueries() throws IOException {
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
+
+                Pagoda pagoda = Pagoda.builder()
+                                .ontology(Paths.get(ontoDir, "fly/fly_rolledUp.owl"))
+//                                                        .ontology(Paths.get(ontoDir, "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl"))
+                                .query(Paths.get(ontoDir, "fly/queries/new_queries.sparql"))
+//                                                        .answer(Paths.get("/home/alessandro/Desktop/answers.json"))
+                                .classify(false)
+                                .hermit(true)
+                                .skolem(false)
+                                .build();
+
+                pagoda.run();
+        }
+
+        @Test(groups = {"light", "comparison"})
+        public void compare_newQueries() throws IOException {
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
+
+                Timer timer = new Timer();
+                Pagoda.builder()
+                          .ontology(Paths.get(ontoDir, "fly/fly_rolledUp.owl"))
+                          .query(Paths.get(ontoDir, "fly/queries/new_queries.sparql"))
+                          .classify(false)
+                          .hermit(true)
+                                .skolem(true) // <----<< Skolem upper bound is ENABLED <<<
+                                .build()
+                                .run();
+                double t1 = timer.duration();
+
+                timer.reset();
+
+                Pagoda.builder()
+                          .ontology(Paths.get(ontoDir, "fly/fly_rolledUp.owl"))
+                          .query(Paths.get(ontoDir, "fly/queries/new_queries.sparql"))
+                          .classify(false)
+                          .hermit(true)
+                                .skolem(false) // <----<< Skolem upper bound is DISABLED <<<
+                                .build()
+                                .run();
+                double t2 = timer.duration();
+
+                if(t1 < t2)
+                        TestUtil.logInfo("Overall reasoning with Skolem upper bound was " + (int) (t2 / t1 * 100 - 100) + "x faster!");
+                else
+                        TestUtil.logInfo("Overall reasoning with Skolem upper bound was " + (int) (t1 / t2 * 100 - 100) + "x slower...");
+        }
 }
diff --git a/test/uk/ac/ox/cs/pagoda/util/TestUtil.java b/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
index c3909d5..fdd242a 100644
--- a/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
+++ b/test/uk/ac/ox/cs/pagoda/util/TestUtil.java
@@ -22,7 +22,7 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 public class TestUtil {
 
     public static final String CONFIG_FILE = "test.properties";
-
+    private static final Logger LOGGER = Logger.getLogger("Tester");
     private static boolean isConfigLoaded = false;
     private static Properties config;
 
@@ -71,4 +71,20 @@ public class TestUtil {
         return Paths.get(givenAnswersURL.getPath());
     }
 
+    public static void logInfo(Object msg) {
+        LOGGER.info(msg);
+    }
+
+    public static void logDebug(Object msg) {
+        LOGGER.debug(msg);
+    }
+
+    public static void logError(Object msg) {
+        LOGGER.error(msg);
+    }
+
+    public static void logError(Object msg, Throwable t) {
+        LOGGER.error(msg, t);
+    }
+
 }