1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/scala/rsacomb/RDFoxClassExprConverter.scala b/src/main/scala/rsacomb/RDFoxClassExprConverter.scala
index b9d3ea2..a319d86 100644
--- a/src/main/scala/rsacomb/RDFoxClassExprConverter.scala
+++ b/src/main/scala/rsacomb/RDFoxClassExprConverter.scala
@@ -34,7 +34,7 @@ import org.semanticweb.owlapi.model.OWLObjectProperty
 object RDFoxClassExprConverter {
 
   def apply(
-      term: Term = Variable.create("x"),
+      term: Term,
       skolem: SkolemStrategy = SkolemStrategy.None,
       unsafe: List[OWLObjectPropertyExpression] = List()
   ): RDFoxClassExprConverter =
@@ -61,7 +61,8 @@ class RDFoxClassExprConverter(
 
   // OWLClass
   override def visit(expr: OWLClass): RDFoxRuleShards = {
-    val atom = List(Atom.rdf(term, IRI.RDF_TYPE, expr.getIRI()))
+    val iri: IRI = if (expr.isTopEntity()) IRI.THING else expr.getIRI()
+    val atom = List(Atom.rdf(term, IRI.RDF_TYPE, iri))
     RDFoxRuleShards(atom, List())
   }
 
@@ -94,9 +95,8 @@ class RDFoxClassExprConverter(
 
   // OWLObjectSomeValuesFrom
   override def visit(expr: OWLObjectSomeValuesFrom): RDFoxRuleShards = {
-    // TODO: variables needs to be handled at visitor level. Hardcoding
-    // the name of the varibles might lead to errors for complex cases.
-    val y = Variable.create("y")
+    val y = RSA.getFreshVariable()
+    // Here we are assuming a role name
     val prop = expr.getProperty()
     // Computes the result of rule skolemization. Depending on the used
     // technique it might involve the introduction of additional atoms,
@@ -139,7 +139,7 @@ class RDFoxClassExprConverter(
   // OWLObjectMaxCardinality
   override def visit(expr: OWLObjectMaxCardinality): RDFoxRuleShards = {
     // TODO: again, no hardcoded variables
-    val vars = List(Variable.create("y"), Variable.create("z"))
+    val vars = List(RSA.getFreshVariable(), RSA.getFreshVariable())
     val classResult = RDFoxClassExprConverter.merge(
       vars
         .map(new RDFoxClassExprConverter(_, skolem, unsafe))