From e1a04294ed8737444e40323474f4084cb64c1d55 Mon Sep 17 00:00:00 2001 From: Federico Igne Date: Tue, 17 Nov 2020 14:19:08 +0000 Subject: Remove implicit RSAOntology conversion This was causing problems without giving any significant advantage. Now it will be easier to refactor classes like RSA, RSAOntology, CanonicalModel. --- src/main/scala/rsacomb/RSA.scala | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/main/scala/rsacomb/RSA.scala') diff --git a/src/main/scala/rsacomb/RSA.scala b/src/main/scala/rsacomb/RSA.scala index dd09899..b0e140b 100644 --- a/src/main/scala/rsacomb/RSA.scala +++ b/src/main/scala/rsacomb/RSA.scala @@ -1,13 +1,11 @@ package rsacomb /* Java imports */ -import java.io.File import java.util.Map import tech.oxfordsemantic.jrdfox.formats.SPARQLParser import tech.oxfordsemantic.jrdfox.Prefixes import tech.oxfordsemantic.jrdfox.logic.expression.{Variable, IRI} -import org.semanticweb.owlapi.apibinding.OWLManager import org.semanticweb.owlapi.model.OWLOntology import org.semanticweb.owlapi.model.{ OWLAxiom, @@ -18,7 +16,7 @@ import org.semanticweb.owlapi.model.{ // Debug only import scala.collection.JavaConverters._ -object RSA extends RSAOntology with RSAAxiom { +object RSA extends RSAAxiom { val Prefixes: Prefixes = new Prefixes() Prefixes.declarePrefix(":", "http://example.com/rsa_example.owl#") @@ -28,6 +26,7 @@ object RSA extends RSAOntology with RSAAxiom { Prefixes.declarePrefix("owl:", "http://www.w3.org/2002/07/owl#") val EquivTo: IRI = this.rsa("EquivTo") + val Named: IRI = this.rsa("NAMED") // Counter used to implement a simple fresh variable generator private var counter = -1; @@ -61,10 +60,4 @@ object RSA extends RSAOntology with RSAAxiom { this.hashed(cls1, prop, cls2) } - // TODO: move this somewhere else... maybe an OntoUtils class or something. - def loadOntology(onto: File): OWLOntology = { - val manager = OWLManager.createOWLOntologyManager() - manager.loadOntologyFromOntologyDocument(onto) - } - } // object RSA -- cgit v1.2.3