From 3a166085e656be5f957423e6e371b6647b313997 Mon Sep 17 00:00:00 2001 From: Federico Igne Date: Wed, 19 Aug 2020 11:11:53 +0100 Subject: Use `rdf(..)` instead of `create(..)` to create `Atom`s --- .../scala/rsacomb/RDFoxPropertyExprConverter.scala | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala') diff --git a/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala b/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala index 78ac98c..340fa90 100644 --- a/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala +++ b/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala @@ -3,29 +3,28 @@ package rsacomb import org.semanticweb.owlapi.model.{OWLPropertyExpression, OWLObjectProperty} import org.semanticweb.owlapi.model.OWLPropertyExpressionVisitorEx -import tech.oxfordsemantic.jrdfox.logic.{TupleTableName} -import tech.oxfordsemantic.jrdfox.logic.{Atom, Term, Variable, Literal} +import tech.oxfordsemantic.jrdfox.logic.{Atom, Term, IRI, Variable, Literal} import rsacomb.SkolemStrategy import org.semanticweb.owlapi.model.OWLObjectInverseOf -class RDFoxPropertyExprConverter(term1 : Term, term2 : Term, skolem : SkolemStrategy) - extends OWLPropertyExpressionVisitorEx[List[Atom]] -{ +class RDFoxPropertyExprConverter( + term1: Term, + term2: Term, + skolem: SkolemStrategy +) extends OWLPropertyExpressionVisitorEx[List[Atom]] { - override - def visit(expr : OWLObjectProperty) : List[Atom] = { - val name = expr.getIRI.getIRIString - List(Atom.create(TupleTableName.create(name), term1, term2)) - } + // Automatically converts OWLAPI types into RDFox equivalent types. + import RDFoxUtil.owlapi2rdfox; + + override def visit(expr: OWLObjectProperty): List[Atom] = + List(Atom.rdf(term1, expr.getIRI, term2)) - override - def visit(expr : OWLObjectInverseOf) : List[Atom] = { + override def visit(expr: OWLObjectInverseOf): List[Atom] = { val name = expr.getInverse.getNamedProperty.getIRI.getIRIString; - List(Atom.create(TupleTableName.create(name ++ "_inv"), term1, term2)) + List(Atom.rdf(term1, IRI.create(name ++ "_inv"), term2)) } - def doDefault(expr : OWLPropertyExpression) : List[Atom] = List() + def doDefault(expr: OWLPropertyExpression): List[Atom] = List() } // class RDFoxPropertyExprConverter - -- cgit v1.2.3