From 80dbaf650804182e0db9f8bdfc9ba884a3a8a846 Mon Sep 17 00:00:00 2001 From: Federico Igne Date: Fri, 2 Apr 2021 11:03:22 +0100 Subject: Apply minor tweaks --- src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala | 3 ++- .../scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 11 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 909cfdd..2e7f586 100644 --- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala @@ -128,6 +128,7 @@ object RSAComb extends App { val ontology = RSAOntology(config('ontology).get[File], config('data).get[List[File]]: _*) + if (ontology.isRSA) { Logger print "Ontology is RSA!" @@ -139,7 +140,7 @@ object RSAComb extends App { ConjunctiveQuery.parse(query) match { case Some(query) => { val answers = ontology ask query - Logger.print(s"$answers", Logger.QUIET) + //Logger.print(s"$answers", Logger.QUIET) Logger print s"Number of answers: ${answers.length} (${answers.lengthWithMultiplicity})" // /* Additional DEBUG information */ 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 4243b7b..763f4f5 100644 --- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala @@ -454,6 +454,8 @@ class RSAOntology(_ontology: File, val datafiles: File*) { /* Upload data from data file */ RDFoxUtil.addData(data, datafiles: _*) + RDFoxUtil printStatisticsFor data + /* Top / equality axiomatization */ RDFoxUtil.addRules(data, topAxioms ++ equalityAxioms) @@ -471,25 +473,25 @@ class RSAOntology(_ontology: File, val datafiles: File*) { Logger print s"Canonical model facts: ${canon.facts.length}" RDFoxUtil.addFacts(data, canon.facts) + //{ + // import java.io.{PrintStream, FileOutputStream, File} + // val rules1 = new FileOutputStream(new File("rules1-lubm200.dlog")) + // val facts1 = new FileOutputStream(new File("facts1-lubm200.ttl")) + // RDFoxUtil.export(data, rules1, facts1) + // val rules2 = new PrintStream(new File("rules2-q34.dlog")) + // rules2.print(filter.rules.mkString("\n")) + //} + //canon.facts.foreach(println) - //canon.rules.foreach(println) + //filter.rules.foreach(println) RDFoxUtil printStatisticsFor data Logger print s"Filtering program rules: ${filter.rules.length}" RDFoxUtil.addRules(data, filter.rules) - //data.commitTransaction() - RDFoxUtil printStatisticsFor data - //{ - // import java.io.{FileOutputStream, File} - // val rules = new FileOutputStream(new File("rules2.dlog")) - // val facts = new FileOutputStream(new File("facts2.ttl")) - // RDFoxUtil.export(data, rules, facts) - //} - val answers = { val ans = filter.answerQuery RDFoxUtil -- cgit v1.2.3