Unify use of RSASuffix

This commit comes with minor fixes and code simplifications.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala b/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala
index ea1df2f..525ec62 100644
--- a/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala
+++ b/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala
@@ -20,15 +20,14 @@ class RDFoxPropertyExprConverter(
   import RDFoxUtil.owlapi2rdfox;
 
   override def visit(expr: OWLObjectProperty): List[TupleTableAtom] = {
-    //val pred = IRI.create(expr.getIRI.getIRIString ++ suffix.getSuffix)
-    val pred = IRI.create(expr :: suffix)
+    val base = expr.getIRI.getIRIString
+    val pred = IRI.create(base :: suffix)
     List(TupleTableAtom.rdf(term1, pred, term2))
   }
 
   override def visit(expr: OWLObjectInverseOf): List[TupleTableAtom] = {
-    //expr.getInverse.getNamedProperty.getIRI.getIRIString ++ suffix.getSuffix ++ "_inv"
-    val pred = IRI.create(expr :: suffix + Inverse)
-    List(TupleTableAtom.rdf(term1, pred, term2))
+    val visitor = new RDFoxPropertyExprConverter(term1, term2, suffix + Inverse)
+    expr.getInverse.accept(visitor)
   }
 
   def doDefault(expr: OWLPropertyExpression): List[TupleTableAtom] = List()