Make filtering program generate/load facts as facts

3 files changed, 26 insertions, 16 deletions

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala
index 52be937..4e533c6 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala
@@ -76,6 +76,15 @@ class FilteringProgram(query: ConjunctiveQuery, constants: List[Term]) {
   val nis: Rule =
     Rule.create(RSA.NI(varX), RSA.Congruent(varX, varY), RSA.Named(varY))
 
+  /** Initializes instances of `rsa:Named`.
+    *
+    * They represent the set of constants appearing in the original
+    * ontology.
+    *
+    * @note corresponds to rules 2 in Table 3.
+    */
+  val facts = constants map RSA.Named
+
   /** Collection of filtering program rules. */
   val rules: List[Rule] =
     nis :: {
@@ -89,15 +98,6 @@ class FilteringProgram(query: ConjunctiveQuery, constants: List[Term]) {
         */
       val r1 = Rule.create(RSA.QM, query.atoms: _*)
 
-      /** Initializes instances of `rsa:Named`.
-        *
-        * They represent the set of constants appearing in the original
-        * ontology.
-        *
-        * @note corresponds to rules 2 in Table 3.
-        */
-      val r2 = constants.map(c => Rule.create(RSA.Named(c)))
-
       /** Initializes instances of `rsa:ID`.
         *
         * They are initialized as a minimal congruence relation over the
@@ -307,7 +307,7 @@ class FilteringProgram(query: ConjunctiveQuery, constants: List[Term]) {
         */
       val r9 = Rule.create(RSA.Ans, RSA.QM, not(RSA.SP))
 
-      (r1 :: r2 :::
+      (r1 ::
         r3a ::: r3b :: r3c ::
         r4a ::: r4b ::: r4c :::
         r5a ::: r5b ::: r5c :::
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 f90e3c1..a965ef9 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -327,9 +327,11 @@ class RSAOntology(val ontology: OWLOntology) {
   def ask(query: ConjunctiveQuery): ConjunctiveQueryAnswers = {
     import implicits.JavaCollections._
     val (server, data) = RDFoxUtil.openConnection(RSAOntology.DataStore)
+    val filter = this.filteringProgram(query)
     RDFoxUtil.addRules(data, this.canonicalModel.rules)
     RDFoxUtil.addFacts(data, this.canonicalModel.facts)
-    data.addRules(this.filteringProgram(query).rules)
+    RDFoxUtil.addRules(data, filter.rules)
+    RDFoxUtil.addFacts(data, filter.facts)
     val answers = RDFoxUtil
       .submitQuery(
         data,
diff --git a/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala
index 71c9a99..86e0253 100644
--- a/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala
@@ -65,24 +65,32 @@ class FilteringProgramSpec extends AnyFlatSpec with Matchers {
 
   import FilteringProgramSpec._
 
-  "CQ 0" should "generate 30 rules" in {
+  "CQ 0" should "generate 27 rules and 3 facts" in {
     val cq = ConjunctiveQuery(cq0).get
-    FilteringProgram(cq, constants).rules should have length 30
+    val filter = FilteringProgram(cq, constants)
+    filter.facts should have length 3
+    filter.rules should have length 27
   }
 
   "CQ 1" should "generate 15 rules" in {
     val cq = ConjunctiveQuery(cq1).get
-    FilteringProgram(cq, List()).rules should have length 15
+    val filter = FilteringProgram(cq, List())
+    filter.facts shouldBe empty
+    filter.rules should have length 15
   }
 
   "CQ 2" should "generate 51 rules" in {
     val cq = ConjunctiveQuery(cq2).get
-    FilteringProgram(cq, List()).rules should have length 51
+    val filter = FilteringProgram(cq, List())
+    filter.facts shouldBe empty
+    filter.rules should have length 51
   }
 
   "BCQ 0" should "generate 46 rules" in {
     val cq = ConjunctiveQuery(bcq0).get
-    FilteringProgram(cq, constants).rules should have length 46
+    val filter = FilteringProgram(cq, constants)
+    filter.facts should have length 3
+    filter.rules should have length 43
   }
 
 }