Add external script to execute benchmarks and gather results.

3 files changed, 11 insertions, 9 deletions

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
index 0554dbc..bf96a31 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
@@ -61,7 +61,7 @@ object RSAComb extends App {
       case Some(query) => {
         val answers = ontology ask query
         Logger.print(s"$answers", Logger.QUIET)
-        Logger print s"Number of answer: ${answers.length} (${answers.lengthWithMultiplicity})"
+        Logger print s"Number of answers: ${answers.length} (${answers.lengthWithMultiplicity})"
 
         /* Additional DEBUG information */
         if (Logger.level >= Logger.DEBUG) {
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
index 4ac5a77..8d5bf4c 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -114,9 +114,9 @@ class RSAOntology(val ontology: OWLOntology) {
 
   val axioms: List[OWLLogicalAxiom] = abox ::: tbox ::: rbox
 
-  Logger.print(s"Original TBox: ${tbox.length} axioms", Logger.DEBUG)
-  Logger.print(s"Original RBox: ${rbox.length} axioms", Logger.DEBUG)
-  Logger.print(s"Original ABox: ${abox.length} axioms", Logger.DEBUG)
+  Logger.print(s"Original TBox: ${tbox.length}", Logger.DEBUG)
+  Logger.print(s"Original RBox: ${rbox.length}", Logger.DEBUG)
+  Logger.print(s"Original ABox: ${abox.length}", Logger.DEBUG)
 
   /* Retrieve individuals in the original ontology
    */
@@ -358,16 +358,18 @@ class RSAOntology(val ontology: OWLOntology) {
 
       //data.beginTransaction(TransactionType.READ_WRITE)
 
-      Logger print s"Canonical model: ${canon.rules.length} rules"
+      Logger print s"Canonical model rules: ${canon.rules.length}"
       RDFoxUtil.addRules(data, this.canonicalModel.rules)
 
-      Logger print s"Canonical model: ${canon.facts.length} facts"
+      Logger print s"Canonical model facts: ${canon.facts.length}"
       RDFoxUtil.addFacts(data, this.canonicalModel.facts)
 
-      Logger print s"Filtering program: ${filter.facts.length} facts"
+      RDFoxUtil printStatisticsFor data
+
+      Logger print s"Filtering program facts: ${filter.facts.length}"
       RDFoxUtil.addFacts(data, filter.facts)
 
-      Logger print s"Filtering program: ${filter.rules.length} rules"
+      Logger print s"Filtering program rules: ${filter.rules.length}"
       RDFoxUtil.addRules(data, filter.rules)
 
       //data.commitTransaction()
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala
index 74797a2..56e9de0 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala
@@ -38,7 +38,7 @@ object Logger {
     print(s"$desc (START)", lvl)
     val result = expr
     val t1 = System.currentTimeMillis()
-    print(s"$desc (END): ${(t1 - t0).toFloat / 1000}s", lvl)
+    print(s"$desc (END): ${(t1 - t0).toFloat / 1000}", lvl)
     result
   }