1 files changed, 25 insertions, 19 deletions

diff --git a/test/uk/ac/ox/cs/pagoda/test_units/CostEvaluation.java b/test/uk/ac/ox/cs/pagoda/test_units/CostEvaluation.java
index 4e32297..968cf01 100644
--- a/test/uk/ac/ox/cs/pagoda/test_units/CostEvaluation.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/CostEvaluation.java
@@ -1,12 +1,12 @@
 package uk.ac.ox.cs.pagoda.test_units;
 
 import org.semanticweb.owlapi.model.OWLOntology;
-
 import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.owl.OWLHelper;
 import uk.ac.ox.cs.pagoda.reasoner.QueryReasoner;
 import uk.ac.ox.cs.pagoda.reasoner.QueryReasoner.Type;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
+import uk.ac.ox.cs.pagoda.util.TestUtil;
 import uk.ac.ox.cs.pagoda.util.Timer;
 import uk.ac.ox.cs.pagoda.util.Utility;
 
@@ -15,20 +15,22 @@ public class CostEvaluation {
         @Test
         public void lubm100() {
                 int number = 1;
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "lubm/univ-bench.owl",
-                                PagodaTester.onto_dir + "lubm/data/lubm" + number + ".ttl",
-                                PagodaTester.onto_dir + "lubm/queries/test_all_pagoda.sparql"
+                                TestUtil.combinePaths(ontoDir, "lubm/univ-bench.owl"),
+                                TestUtil.combinePaths(ontoDir, "lubm/data/lubm" + number + ".ttl"),
+                                TestUtil.combinePaths(ontoDir, "lubm/queries/test_all_pagoda.sparql")
                 ); 
 //              AllTests.copy("output/log4j.log", "results-backup/jair/lubm" + number + ".out"); 
         }
         
         public void lubm1000() {
                 int number = 1000;
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 String[] args = new String[] {
-                                PagodaTester.onto_dir + "lubm/univ-bench.owl",
-                                PagodaTester.onto_dir + "lubm/data/lubm" + number + ".ttl",
-                                PagodaTester.onto_dir + "lubm/queries/test_all_pagoda.sparql" 
+                                TestUtil.combinePaths(ontoDir, "lubm/univ-bench.owl"),
+                                TestUtil.combinePaths(ontoDir, "lubm/data/lubm" + number + ".ttl"),
+                                TestUtil.combinePaths(ontoDir, "lubm/queries/test_all_pagoda.sparql")
                 }; 
                 OWLOntology ontology = OWLHelper.loadOntology(args[0]); 
                 QueryReasoner reasoner = QueryReasoner.getInstance(Type.ELHOU, ontology, true, true); 
@@ -46,10 +48,11 @@ public class CostEvaluation {
         @Test
         public void uobm5() {
                 int number = 1;
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 String[] args = new String[] {
-                                PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
-                                PagodaTester.onto_dir + "uobm/data/uobm" + number + ".ttl",
-                                PagodaTester.onto_dir + "uobm/queries/standard_all_pagoda.sparql" 
+                                TestUtil.combinePaths(ontoDir, "uobm/univ-bench-dl.owl"),
+                                TestUtil.combinePaths(ontoDir, "uobm/data/uobm" + number + ".ttl"),
+                                TestUtil.combinePaths(ontoDir, "uobm/queries/standard_all_pagoda.sparql")
                 }; 
                 PagodaTester.main(args);
 //              AllTests.copy("output/log4j.log", "results-backup/jair/uobm" + number + ".out"); 
@@ -57,10 +60,11 @@ public class CostEvaluation {
         
         public void uobm100() {
                 int number = 200;
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 String[] args = new String[] {
-                                PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
-                                PagodaTester.onto_dir + "uobm/data/uobm" + number + ".ttl",
-                                PagodaTester.onto_dir + "uobm/queries/standard_group3_all.sparql" 
+                                TestUtil.combinePaths(ontoDir, "uobm/univ-bench-dl.owl"),
+                                TestUtil.combinePaths(ontoDir, "uobm/data/uobm" + number + ".ttl"),
+                                TestUtil.combinePaths(ontoDir, "uobm/queries/standard_group3_all.sparql")
                 }; 
                 PagodaTester.main(args);
 //              AllTests.copy("output/log4j.log", "results-backup/jair/uobm" + number + ".out"); 
@@ -68,10 +72,11 @@ public class CostEvaluation {
         
         public void uobm500() {
                 int number = 500;
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 String[] args = new String[] {
-                                PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
-                                PagodaTester.onto_dir + "uobm/data/uobm" + number + ".ttl",
-                                PagodaTester.onto_dir + "uobm/queries/standard_all_pagoda.sparql" 
+                                TestUtil.combinePaths(ontoDir, "uobm/univ-bench-dl.owl"),
+                                TestUtil.combinePaths(ontoDir, "uobm/data/uobm" + number + ".ttl"),
+                                TestUtil.combinePaths(ontoDir, "uobm/queries/standard_all_pagoda.sparql")
                 }; 
                 
                 OWLOntology ontology = OWLHelper.loadOntology(args[0]); 
@@ -89,10 +94,11 @@ public class CostEvaluation {
         
         
         public static void main(String... args) {
+                String ontoDir = TestUtil.getConfig().getProperty("ontoDir");
                 args = new String[] {
-                                PagodaTester.onto_dir + "dbpedia/integratedOntology-all-in-one-minus-datatype.owl", 
-                                PagodaTester.onto_dir + "dbpedia/data/dbpedia-minus-datatype-new.ttl",
-                                PagodaTester.onto_dir + "dbpedia/queries/atomic_ground.sparql"
+                                TestUtil.combinePaths(ontoDir, "dbpedia/integratedOntology-all-in-one-minus-datatype.owl"),
+                                TestUtil.combinePaths(ontoDir, "dbpedia/data/dbpedia-minus-datatype-new.ttl"),
+                                TestUtil.combinePaths(ontoDir, "dbpedia/queries/atomic_ground.sparql")
                 }; 
                 
                 OWLOntology ontology = OWLHelper.loadOntology(args[0]);