Add shifting for disjunction in the rhs of an axiom

2 files changed, 77 insertions, 2 deletions

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
index a771e3d..fe81312 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
@@ -31,6 +31,10 @@ class Normalizer() {
     factory.getOWLClass(s"X$counter")
   }
 
+  /** Statistics */
+  private var discarted = 0
+  private var shifted = 0
+
   /** Normalizes a
     * [[org.semanticweb.owlapi.model.OWLLogicalAxiom OWLLogicalAxiom]]
     *
@@ -122,8 +126,12 @@ class Normalizer() {
               )
             }
           }
-          /** Disjunction on the rhs is not supported */
-          case (_, sup: OWLObjectUnionOf) => notInHornALCHOIQ(a)
+          /** Disjunction on the rhs is not supported directly
+            *
+            * Instead we `shift` the rule to eliminate the disjunction.
+            */
+          case (_, sup: OWLObjectUnionOf) =>
+            shift(sub, sup) flatMap normalize
           /** Complex class expression on existential restriction on the lhs
             *
             *   exists R . C c D -> { C c X, exists R . X c D }
@@ -515,6 +523,50 @@ class Normalizer() {
       case a => Seq(a)
     }
 
+  /** Shift an axiom with disjunction on the rhs */
+  private def shift(
+      sub: OWLClassExpression,
+      sup: OWLObjectUnionOf
+  ): Seq[OWLLogicalAxiom] = {
+    val body = sub.asConjunctSet.map((atom) => (atom, freshOWLClass()))
+    val head = sup.asDisjunctSet.map((atom) => (atom, freshOWLClass()))
+
+    /* Update statistics */
+    shifted += 1
+
+    val r1 =
+      factory.getOWLSubClassOfAxiom(
+        factory.getOWLObjectIntersectionOf(
+          (body.map(_._1) ++ head.map(_._2)): _*
+        ),
+        factory.getOWLNothing
+      )
+
+    val r2s =
+      for {
+        (a, na) <- head
+        hs = head.map(_._2).filterNot(_ equals na)
+      } yield factory.getOWLSubClassOfAxiom(
+        factory.getOWLObjectIntersectionOf(
+          (body.map(_._1) ++ hs): _*
+        ),
+        a
+      )
+
+    val r3s =
+      for {
+        (a, na) <- body
+        bs = body.map(_._1).filterNot(_ equals a)
+      } yield factory.getOWLSubClassOfAxiom(
+        factory.getOWLObjectIntersectionOf(
+          (bs ++ head.map(_._2)): _*
+        ),
+        na
+      )
+
+    Seq(r1) ++ r2s ++ r3s
+  }
+
   /** Approximation function for axioms out of Horn-ALCHOIQ
     *
     * By default discards the axiom, which guarantees a lower bound
@@ -523,6 +575,8 @@ class Normalizer() {
   protected def notInHornALCHOIQ(
       axiom: OWLLogicalAxiom
   ): Seq[OWLLogicalAxiom] = {
+    /* Update statistics */
+    discarted += 1
     Logger print s"'$axiom' has been ignored because it is not in Horn-ALCHOIQ"
     Seq()
   }
diff --git a/src/test/scala/uk/ac/ox/cs/rsacomb/converter/NormalizerSpec.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/converter/NormalizerSpec.scala
index 3a686c0..7f0f720 100644
--- a/src/test/scala/uk/ac/ox/cs/rsacomb/converter/NormalizerSpec.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/converter/NormalizerSpec.scala
@@ -73,6 +73,27 @@ class NormalizerSpec extends AnyFlatSpec with Matchers with LoneElement {
       ).flatMap(normalizer.normalize)
   }
 
+  "Disjunction on the rhs" should "be shifted" in {
+    def cls(n: Int) = factory.getOWLClass(s"_:class$n")
+    val axiom1 =
+      factory.getOWLSubClassOfAxiom(
+        factory.getOWLObjectIntersectionOf(cls(1), cls(2), cls(3)),
+        factory.getOWLObjectUnionOf(cls(4), cls(5))
+      )
+    val axiom2 =
+      factory.getOWLSubClassOfAxiom(
+        cls(1),
+        factory.getOWLObjectUnionOf(cls(2), cls(3), cls(4))
+      )
+    val axiom3 =
+      factory.getOWLSubClassOfAxiom(
+        factory.getOWLObjectIntersectionOf(cls(1), cls(2), cls(3)),
+        factory.getOWLObjectUnionOf(cls(4))
+      )
+    normalizer.normalize(axiom1) should have length 5
+    normalizer.normalize(axiom2) should have length 5
+    normalizer.normalize(axiom3) should have length 4
+  }
   //"A class name" should "be converted into a single atom" in {
   //  val cls = factory.getOWLClass(iriString0)
   //  val atom = TupleTableAtom.rdf(term0, IRI.RDF_TYPE, IRI.create(iriString0))