Fix bug in conflict set computation

3 files changed, 23 insertions, 5 deletions

diff --git a/src/main/scala/rsacomb/CanonicalModel.scala b/src/main/scala/rsacomb/CanonicalModel.scala
index a248d61..c07fc06 100644
--- a/src/main/scala/rsacomb/CanonicalModel.scala
+++ b/src/main/scala/rsacomb/CanonicalModel.scala
@@ -86,10 +86,10 @@ class ProgramGenerator(
   import RDFoxUtil._
 
   def rules1(axiom: OWLSubClassOfAxiom): List[Rule] = {
-    val unfold = ontology.cycle(axiom).toList
+    val unfold = ontology.unfold(axiom).toList
     // Fresh Variables
     val v0 = IRI.create("v0_" ++ axiom.hashCode.toString)
-    val varX = Variable.create("x")
+    val varX = Variable.create("X")
     // Predicates
     val atomA: Atom = {
       val cls = axiom.getSubClass.asInstanceOf[OWLClass].getIRI
diff --git a/src/main/scala/rsacomb/RSAOntology.scala b/src/main/scala/rsacomb/RSAOntology.scala
index 2941440..9e45c28 100644
--- a/src/main/scala/rsacomb/RSAOntology.scala
+++ b/src/main/scala/rsacomb/RSAOntology.scala
@@ -264,10 +264,15 @@ trait RSAOntology {
         .map(_.getInverseProperty)
 
       invSuperRoles
-        .flatMap(
-          reasoner.subObjectProperties(_).collect(Collectors.toSet()).asScala
+        .flatMap(x =>
+          reasoner
+            .subObjectProperties(x)
+            .collect(Collectors.toSet())
+            .asScala
+            .addOne(x)
         )
         .filterNot(_.isOWLBottomObjectProperty())
+        .filterNot(_.getInverseProperty.isOWLTopObjectProperty())
     }
 
     def self(axiom: OWLSubClassOfAxiom): Set[Term] = {
diff --git a/src/test/scala/rsacomb/CanonicalModelSpec.scala b/src/test/scala/rsacomb/CanonicalModelSpec.scala
index c528328..c5f040d 100644
--- a/src/test/scala/rsacomb/CanonicalModelSpec.scala
+++ b/src/test/scala/rsacomb/CanonicalModelSpec.scala
@@ -5,7 +5,6 @@ import org.scalatest.LoneElement
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
-
 import org.semanticweb.owlapi.model._
 import uk.ac.manchester.cs.owl.owlapi._
 import org.semanticweb.owlapi.dlsyntax.renderer.DLSyntaxObjectRenderer
@@ -72,10 +71,24 @@ class Ontology1_CanonicalModelSpec
     ontology.unsafeRoles should not contain roleR
   }
 
+  it should "have 3 elements in its conflict set" in {
+    ontology.confl(roleR) should have size 3
+  }
+
   it should "contain S in its conflict set" in {
     ontology.confl(roleR) should contain(roleS)
   }
 
+  it should "contain T in its conflict set" in {
+    ontology.confl(roleR) should contain(roleT)
+  }
+
+  it should ("contain " + renderer.render(
+    roleR_inv
+  ) + " in its conflict set") in {
+    ontology.confl(roleR) should contain(roleR_inv)
+  }
+
   renderer.render(roleS) should "be safe" in {
     ontology.unsafeRoles should not contain roleS
   }