4 files changed, 437 insertions, 12 deletions

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 4d71bca..7ff0fd3 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -117,7 +117,7 @@ object RSAOntology {
   def filteringProgram(query: ConjunctiveQuery): FilteringProgram =
     Logger.timed(
       {
-        val filter = FilteringProgram(FilterType.REVISED)
+        val filter = FilteringProgram(FilterType.REVISEDv2)
         filter(CanonGraph, FilterGraph(query), query)
       },
       "Generating filtering program",
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/FilteringProgram.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/FilteringProgram.scala
index 075954e..c732784 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/FilteringProgram.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/FilteringProgram.scala
@@ -17,10 +17,20 @@
 package uk.ac.ox.cs.rsacomb.filtering
 
 import tech.oxfordsemantic.jrdfox.logic.datalog.Rule
-import tech.oxfordsemantic.jrdfox.logic.expression.IRI
+import tech.oxfordsemantic.jrdfox.logic.expression.{IRI, Variable}
 import uk.ac.ox.cs.rsacomb.sparql.ConjunctiveQuery
 import uk.ac.ox.cs.rsacomb.util.Versioned
 
+object RDFoxDSL {
+
+  import scala.collection.JavaConverters._
+
+  implicit class MyVariable(private val str: StringContext) extends AnyVal {
+    def v(args: Any*): Variable = Variable.create(s"${str.s(args: _*)}")
+  }
+
+}
+
 /** Type of filtering strategy.
   *
   * Mainly for testing different approaches and techniques.
@@ -29,6 +39,7 @@ sealed trait FilterType
 object FilterType {
   case object NAIVE extends FilterType
   case object REVISED extends FilterType
+  case object REVISEDv2 extends FilterType
 }
 
 /** Filtering program trait */
@@ -50,6 +61,7 @@ object FilteringProgram extends Versioned[FilterType] {
     filter match {
       case NAIVE   => NaiveFilteringProgram(_, _, _)
       case REVISED => RevisedFilteringProgram(_, _, _)
+      case REVISEDv2 => RevisedFilteringProgram2(_, _, _)
     }
 }
 
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/RevisedFilteringProgram.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/RevisedFilteringProgram.scala
index 94524be..541fdff 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/RevisedFilteringProgram.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/RevisedFilteringProgram.scala
@@ -37,16 +37,6 @@ import uk.ac.ox.cs.rsacomb.sparql.ConjunctiveQuery
 import uk.ac.ox.cs.rsacomb.suffix.{RSASuffix, Forward, Backward}
 import uk.ac.ox.cs.rsacomb.util.{RSA, RDFoxUtil}
 
-object RDFoxDSL {
-
-  import scala.collection.JavaConverters._
-
-  implicit class MyVariable(private val str: StringContext) extends AnyVal {
-    def v(args: Any*): Variable = Variable.create(s"${str.s(args: _*)}")
-  }
-
-}
-
 /** Factory for [[uk.ac.ox.cs.rsacomb.FilteringProgram FilteringProgram]] */
 object RevisedFilteringProgram {
 
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/RevisedFilteringProgram2.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/RevisedFilteringProgram2.scala
new file mode 100644
index 0000000..a282d8a
--- /dev/null
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/filtering/RevisedFilteringProgram2.scala
@@ -0,0 +1,423 @@
+/*
+ * Copyright 2020, 2021 KRR Oxford
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.ac.ox.cs.rsacomb.filtering
+
+//import scala.collection.JavaConverters._
+import tech.oxfordsemantic.jrdfox.logic.Datatype
+import tech.oxfordsemantic.jrdfox.logic.datalog.{
+  Atom,
+  FilterAtom,
+  Rule,
+  TupleTableAtom,
+  TupleTableName,
+  BodyFormula,
+  Negation
+}
+import tech.oxfordsemantic.jrdfox.logic.expression.{
+  IRI,
+  FunctionCall,
+  Term,
+  Variable
+}
+import uk.ac.ox.cs.rsacomb.sparql.ConjunctiveQuery
+import uk.ac.ox.cs.rsacomb.suffix.{RSASuffix, Forward, Backward}
+import uk.ac.ox.cs.rsacomb.util.{RSA, RDFoxUtil}
+
+/** Factory for [[uk.ac.ox.cs.rsacomb.FilteringProgram FilteringProgram]] */
+object RevisedFilteringProgram2 {
+
+  /** Create a new FilteringProgram instance.
+    *
+    * @param query CQ to be converted into logic rules.
+    */
+  def apply(
+      source: IRI,
+      target: IRI,
+      query: ConjunctiveQuery
+  ): RevisedFilteringProgram2 =
+    new RevisedFilteringProgram2(source, target, query)
+
+}
+
+/** Filtering Program generator
+  *
+  * Handles the conversion of a CQ into a set of logic rules,
+  * representing the filtering step of the RSA combined approach.
+  *
+  * Instances can be created using the companion object.
+  */
+class RevisedFilteringProgram2(
+    val source: IRI,
+    val target: IRI,
+    val query: ConjunctiveQuery
+) extends FilteringProgram {
+
+  import RDFoxDSL._
+
+  /** Extends capabilities of
+    * [[tech.oxfordsemantic.jrdfox.logic.datalog.TupleTableAtom TupleTableAtom]]
+    */
+  import uk.ac.ox.cs.rsacomb.implicits.RSAAtom._
+
+  /** Simplify conversion between Java and Scala `List`s */
+  import uk.ac.ox.cs.rsacomb.implicits.JavaCollections._
+
+  /** Implicit parameter used in RSA internal predicates.
+    *
+    * @see [[uk.ac.ox.cs.rsacomb.util.RSA]] for more information.
+    */
+  implicit private[this] val _query = query
+
+  /** `TupleTableName`s for the source/targer named graphs */
+  val tts: TupleTableName = TupleTableName.create(source.getIRI)
+  val ttt: TupleTableName = TupleTableName.create(target.getIRI)
+
+  /** Set of atoms in the body of the query */
+  private val queryBody: List[TupleTableAtom] = query.atoms(tts)
+
+  /** Helpers */
+  private def not(atom: TupleTableAtom): BodyFormula = Negation.create(atom)
+
+  private def QM(x: Term): TupleTableAtom =
+    TupleTableAtom.create(ttt, x, IRI.RDF_TYPE, RSA.QM)
+  private def FK(x: Term): TupleTableAtom =
+    TupleTableAtom.create(ttt, x, IRI.RDF_TYPE, RSA.FK)
+  private def SP(x: Term): TupleTableAtom =
+    TupleTableAtom.create(ttt, x, IRI.RDF_TYPE, RSA.SP)
+  private def NI(x: Term): TupleTableAtom =
+    TupleTableAtom.create(ttt, x, IRI.RDF_TYPE, RSA.NI)
+  private def Ans(x: Term): TupleTableAtom =
+    TupleTableAtom.create(ttt, x, IRI.RDF_TYPE, RSA.ANS)
+  private def ID(x: Term, y: Term): TupleTableAtom =
+    TupleTableAtom.create(ttt, x, RSA.ID, y)
+  private def AQ(suffix: RSASuffix)(x: Term, y: Term): TupleTableAtom =
+    TupleTableAtom.create(ttt, x, RSA.AQ :: suffix, y)
+  private def TQ(suffix: RSASuffix)(x: Term, y: Term): TupleTableAtom =
+    TupleTableAtom.create(ttt, x, RSA.TQ :: suffix, y)
+
+  /** Rule generating the instances of the predicate `rsa:NI`.
+    *
+    * According to the original paper, the set of `rsa:NI` is defined as
+    * the set of constants that are equal (w.r.t. the congruence
+    * relation represented by `rsacomb:Congruent`) to a constant in the
+    * original ontology.
+    *
+    * @note that the set of `rsa:Named` constants is always a subset of
+    * the set of `rsa:NI`s.
+    *
+    * @note in the paper, instances of `rsa:NI` are introduced as facts
+    * during the canonical model computation. By definition of the
+    * predicate, this is not feasible, and the instances are instead
+    * generate in the filtering program using a logic rule.
+    */
+  val nis: Rule =
+    Rule.create(NI(v"X"), RSA.Named(tts)(v"Y"), RSA.Congruent(tts)(v"X", v"Y"))
+
+  /** Collection of filtering program rules. */
+  val rules: List[Rule] =
+    nis :: {
+
+      val variables = query.answer ::: query.bounded
+
+      /** Generates all possible, unfiltered answers.
+        *
+        * @note corresponds to rule 1 in Table 3 in the paper.
+        */
+      val r1 =
+        Rule.create(QM(v"K"), queryBody :+ RSA.Skolem(v"K", variables))
+
+      /** Initializes instances of `rsa:ID`.
+        *
+        * They are initialized as a minimal congruence relation over the
+        * positions of the existential variables in the query which are
+        * mapped to anonymous terms.
+        *
+        * @note corresponds to rules 3x in Table 3.
+        */
+      val r3a =
+        for ((v, i) <- query.bounded.zipWithIndex)
+          yield Rule.create(
+            ID(v"K", v"S"),
+            QM(v"K"),
+            RSA.Skolem(v"K", variables),
+            not(NI(v)),
+            RSA.Skolem(v"S", List(RSA(i), RSA(i)))
+          )
+      val r3b = Rule.create(
+        ID(v"K", v"T"),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"S", List(v"U", v"V")),
+        RSA.Skolem(v"T", List(v"V", v"U"))
+      )
+      val r3c = Rule.create(
+        ID(v"K", v"Q"),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"S", List(v"U", v"V")),
+        ID(v"K", v"T"),
+        RSA.Skolem(v"T", List(v"V", v"W")),
+        RSA.Skolem(v"Q", List(v"U", v"W"))
+      )
+
+      /** Detects forks in the canonical model.
+        *
+        * @note corresponds to rules 4x in Table 3.
+        */
+      val r4a = for {
+        role1 <- queryBody filter (_.isRoleAssertion)
+        index1 = query.bounded indexOf (role1.getArguments get 2)
+        if index1 >= 0
+        role2 <- queryBody filter (_.isRoleAssertion)
+        index2 = query.bounded indexOf (role2.getArguments get 2)
+        if index2 >= 0
+      } yield Rule.create(
+        FK(v"K"),
+        RSA.Skolem(v"S", List(RSA(index1), RSA(index2))),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"K", variables),
+        role1 :: Forward,
+        role2 :: Forward,
+        not(
+          RSA.Congruent(tts)(role1.getArguments get 0, role2.getArguments get 0)
+        )
+      )
+      val r4b = for {
+        role1 <- queryBody filter (_.isRoleAssertion)
+        index1 = query.bounded indexOf (role1.getArguments get 2)
+        if index1 >= 0
+        role2 <- queryBody filter (_.isRoleAssertion)
+        index2 = query.bounded indexOf (role2.getArguments get 0)
+        if index2 >= 0
+      } yield Rule.create(
+        FK(v"K"),
+        RSA.Skolem(v"S", List(RSA(index1), RSA(index2))),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"K", variables),
+        role1 :: Forward,
+        role2 :: Backward,
+        not(
+          RSA.Congruent(tts)(role1.getArguments get 0, role2.getArguments get 2)
+        )
+      )
+      val r4c = for {
+        role1 <- queryBody filter (_.isRoleAssertion)
+        index1 = query.bounded indexOf (role1.getArguments get 0)
+        if index1 >= 0
+        role2 <- queryBody filter (_.isRoleAssertion)
+        index2 = query.bounded indexOf (role2.getArguments get 0)
+        if index2 >= 0
+      } yield Rule.create(
+        FK(v"K"),
+        RSA.Skolem(v"S", List(RSA(index1), RSA(index2))),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"K", variables),
+        role1 :: Backward,
+        role2 :: Backward,
+        not(
+          RSA.Congruent(tts)(role1.getArguments get 2, role2.getArguments get 2)
+        )
+      )
+
+      /** Recursively propagates `rsa:ID` predicate.
+        *
+        * @note corresponds to rules 5x in Table 3.
+        */
+      val r5a = for {
+        role1 <- queryBody filter (_.isRoleAssertion)
+        r1arg0 = role1.getArguments get 0
+        if query.bounded contains r1arg0
+        r1arg2 = role1.getArguments get 2
+        if query.bounded contains r1arg2
+        role2 <- queryBody filter (_.isRoleAssertion)
+        r2arg0 = role2.getArguments get 0
+        if query.bounded contains r2arg0
+        r2arg2 = role2.getArguments get 2
+        if query.bounded contains r2arg2
+      } yield Rule.create(
+        ID(v"K", v"T"),
+        RSA.Skolem(
+          v"S",
+          List(RSA(query.bounded indexOf r1arg2), RSA(query.bounded indexOf r2arg2))
+        ),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"K", variables),
+        role1 :: Forward,
+        role2 :: Forward,
+        RSA.Congruent(tts)(r1arg0, r2arg0),
+        not(NI(r1arg0)),
+        RSA.Skolem(
+          v"T",
+          List(RSA(query.bounded indexOf r1arg0), RSA(query.bounded indexOf r2arg0))
+        )
+      )
+      val r5b = for {
+        role1 <- queryBody filter (_.isRoleAssertion)
+        r1arg0 = role1.getArguments get 0
+        if query.bounded contains r1arg0
+        r1arg2 = role1.getArguments get 2
+        if query.bounded contains r1arg2
+        role2 <- queryBody filter (_.isRoleAssertion)
+        r2arg0 = role2.getArguments get 0
+        if query.bounded contains r2arg0
+        r2arg2 = role2.getArguments get 2
+        if query.bounded contains r2arg2
+      } yield Rule.create(
+        ID(v"K", v"T"),
+        RSA.Skolem(
+          v"S",
+          List(RSA(query.bounded indexOf r1arg2), RSA(query.bounded indexOf r2arg0))
+        ),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"K", variables),
+        role1 :: Forward,
+        role2 :: Backward,
+        RSA.Congruent(tts)(r1arg0, r2arg2),
+        not(NI(r1arg0)),
+        RSA.Skolem(
+          v"T",
+          List(RSA(query.bounded indexOf r1arg0), RSA(query.bounded indexOf r2arg2))
+        )
+      )
+      val r5c = for {
+        role1 <- queryBody filter (_.isRoleAssertion)
+        r1arg0 = role1.getArguments get 0
+        if query.bounded contains r1arg0
+        r1arg2 = role1.getArguments get 2
+        if query.bounded contains r1arg2
+        role2 <- queryBody filter (_.isRoleAssertion)
+        r2arg0 = role2.getArguments get 0
+        if query.bounded contains r2arg0
+        r2arg2 = role2.getArguments get 2
+        if query.bounded contains r2arg2
+      } yield Rule.create(
+        ID(v"K", v"T"),
+        RSA.Skolem(
+          v"S",
+          List(RSA(query.bounded indexOf r1arg0), RSA(query.bounded indexOf r2arg0))
+        ),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"K", variables),
+        role1 :: Backward,
+        role2 :: Backward,
+        RSA.Congruent(tts)(r1arg2, r2arg2),
+        not(NI(r1arg2)),
+        RSA.Skolem(
+          v"T",
+          List(RSA(query.bounded indexOf r1arg2), RSA(query.bounded indexOf r2arg2))
+        )
+      )
+
+      /** Detect cycles in the canonical model.
+        *
+        * Cycles are detected by introducing a new predicate `rsa:AQ`
+        * and computing its transitive closure. Cycles are computed from
+        * forward and backward roles separately.
+        *
+        * @note corresponds to rules 6,7x in Table 3.
+        */
+      val r6 = for {
+        role <- queryBody filter (_.isRoleAssertion)
+        index0 = query.bounded indexOf (role.getArguments get 0)
+        if index0 >= 0
+        index2 = query.bounded indexOf (role.getArguments get 2)
+        if index2 >= 0
+        suffix <- Seq(Forward, Backward)
+      } yield Rule.create(
+        AQ(suffix)(v"K", v"Q"),
+        ID(v"K", v"S"),
+        RSA.Skolem(v"S", List(RSA(index0), v"V")),
+        ID(v"K", v"T"),
+        RSA.Skolem(v"T", List(RSA(index2), v"W")),
+        RSA.Skolem(v"K", variables),
+        role :: suffix,
+        RSA.Skolem(v"Q", List(v"V", v"W"))
+      )
+      val r7a =
+        for (suffix <- List(Forward, Backward))
+          yield Rule.create(
+            TQ(suffix)(v"K", v"S"),
+            AQ(suffix)(v"K", v"S")
+          )
+      val r7b =
+        for (suffix <- List(Forward, Backward))
+          yield Rule.create(
+            TQ(suffix)(v"K", v"Q"),
+            AQ(suffix)(v"K", v"S"),
+            RSA.Skolem(v"S", List(v"U", v"V")),
+            TQ(suffix)(v"K", v"T"),
+            RSA.Skolem(v"T", List(v"V", v"W")),
+            RSA.Skolem(v"Q", List(v"U", v"W"))
+          )
+
+      /** Flag spurious answers.
+        *
+        * @note corresponds to rules 8x in Table 3.
+        */
+      val r8a =
+        for (v <- query.answer)
+          yield Rule.create(
+            SP(v"K"),
+            QM(v"K"),
+            RSA.Skolem(v"K", variables),
+            not(RSA.Named(tts)(v))
+          )
+      val r8b = Rule.create(SP(v"K"), FK(v"K"))
+      val r8c =
+        for (suffix <- List(Forward, Backward))
+          yield Rule.create(
+            SP(v"K"),
+            TQ(suffix)(v"K", v"S"),
+            RSA.Skolem(v"S", List(v"V", v"V"))
+          )
+
+      /** Determine answers to the query
+        *
+        * Answers are identified by predicate `rsa:Ans`. In case the
+        * input query is a BCQ (answer is just true/false), we derive
+        * `rsa:Ans` for a fresh constant `c`. Later on we can query for
+        * instances of `rsa:Ans` as follows
+        *
+        * {{{
+        *   ASK { ?X a rsa:Ans }
+        * }}}
+        *
+        * to determine whether the query is true or false.
+        *
+        * @note corresponds to rule 9 in Table 3.
+        */
+      val r9 = Rule.create(Ans(v"K"), QM(v"K"), not(SP(v"K")))
+
+      (r1 :: r3a ::: r3b :: r3c :: r4a ::: r4b ::: r4c ::: r5a ::: r5b ::: r5c ::: r6 ::: r7b ::: r7a ::: r8a ::: r8b :: r8c ::: r9 :: List())
+    }
+
+  val answerQuery: String = {
+    val arity = query.answer.size
+    if (arity > 0) {
+      val answer = query.answer mkString " "
+      val bounded = query.bounded mkString " "
+      s"""
+        SELECT $answer
+        WHERE {
+            GRAPH $target { ?K a ${RSA.ANS} } .
+            TT ${TupleTableName.SKOLEM} { $answer $bounded ?K } .
+        }
+      """
+    } else {
+      s"ASK { GRAPH $target { ?X a ${RSA.ANS} } }"
+    }
+  }
+
+}