Port code to RDFox v4.1.0

2 files changed, 4 insertions, 11 deletions

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxConverter.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxConverter.scala
index b4f5adb..845ec1f 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxConverter.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxConverter.scala
@@ -40,7 +40,7 @@ import tech.oxfordsemantic.jrdfox.logic.datalog.{
 import tech.oxfordsemantic.jrdfox.logic.expression.{Term, IRI, FunctionCall}
 import uk.ac.ox.cs.rsacomb.RSAOntology
 import uk.ac.ox.cs.rsacomb.suffix.{Empty, Inverse, RSASuffix}
-import uk.ac.ox.cs.rsacomb.util.RSA
+import uk.ac.ox.cs.rsacomb.util.{RSA, RDFoxUtil}
 
 /** Horn-ALCHOIQ to RDFox axiom converter.
   *
@@ -328,10 +328,7 @@ trait RDFoxConverter {
         val (bind, term1) = skolem match {
           case NoSkolem    => (None, varX)
           case c: Constant => (None, c.iri)
-          case s: Standard => {
-            val func = FunctionCall.create("SKOLEM", s.literal, term)
-            (Some(BindAtom.create(func, varX)), varX)
-          }
+          case s: Standard => (Some(RDFoxUtil.skolem(s.name, term, varX)), varX)
         }
         val (res, ext) = convert(cls, term1, unsafe, skolem, suffix)
         val prop = convert(role, term, term1, suffix)
@@ -359,10 +356,7 @@ trait RDFoxConverter {
         val (bind, term1) = skolem match {
           case NoSkolem    => (None, varX)
           case c: Constant => (None, c.iri)
-          case s: Standard => {
-            val func = FunctionCall.create("SKOLEM", s.literal, term)
-            (Some(BindAtom.create(func, varX)), varX)
-          }
+          case s: Standard => (Some(RDFoxUtil.skolem(s.name, term, varX)), varX)
         }
         val prop = convert(role, term, term1, suffix)
         (List(prop), bind.toList)
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/SkolemStrategy.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/SkolemStrategy.scala
index 2142ff3..426a327 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/SkolemStrategy.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/SkolemStrategy.scala
@@ -53,8 +53,7 @@ case object NoSkolem extends SkolemStrategy {
 case class Standard(axiom: OWLAxiom)(implicit toString: (OWLAxiom) => String)
     extends SkolemStrategy {
   def dup(_axiom: OWLAxiom): Standard = copy(axiom = _axiom)(toString)
-  lazy val literal =
-    Literal.create(s"f_${toString(axiom)}", Datatype.XSD_STRING)
+  lazy val name = s"f_${toString(axiom)}"
 }
 
 /** Constant skolemization