aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Igne <git@federicoigne.com>2021-09-01 13:14:23 +0100
committerFederico Igne <git@federicoigne.com>2021-09-01 13:14:23 +0100
commit0f52fea098088d8e90410b97213f60c52407f8ff (patch)
treefe93820ce49deadaae0ec9541caa1015e4d601ef
parente0265f0d9687d2e6188a3be41bc848a7cf9efc40 (diff)
downloadRSAComb-0f52fea098088d8e90410b97213f60c52407f8ff.tar.gz
RSAComb-0f52fea098088d8e90410b97213f60c52407f8ff.zip
Update RDFox library to 5.2.1
-rw-r--r--src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala1
-rw-r--r--src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala17
-rw-r--r--src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala3
3 files changed, 12 insertions, 9 deletions
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
index 869dd88..0c88f7f 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -518,6 +518,7 @@ class RSAOntology(axioms: List[OWLLogicalAxiom], datafiles: List[File])
518 /* Generate `named` predicates */ 518 /* Generate `named` predicates */
519 RDFoxUtil.addFacts(data, (individuals ++ literals) map RSA.Named) 519 RDFoxUtil.addFacts(data, (individuals ++ literals) map RSA.Named)
520 data.evaluateUpdate( 520 data.evaluateUpdate(
521 null, // the base IRI for the query (if null, a default is used)
521 RSA.Prefixes, 522 RSA.Prefixes,
522 "INSERT { ?X a rsa:Named } WHERE { ?X a owl:Thing }", 523 "INSERT { ?X a rsa:Named } WHERE { ?X a owl:Thing }",
523 new java.util.HashMap[String, String] 524 new java.util.HashMap[String, String]
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
index c24f99d..33cb715 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
@@ -599,13 +599,14 @@ class Normalizer() {
599 } 599 }
600 600
601 /** Non supported axioms */ 601 /** Non supported axioms */
602 private def notSupported(axiom: OWLLogicalAxiom): Seq[OWLLogicalAxiom] = 602 private def notSupported(axiom: OWLLogicalAxiom): Seq[OWLLogicalAxiom] = {
603 // Logger.print( 603 Logger.print(
604 // s"'$axiom' has been ignored because it is not in Horn-ALCHOIQ", 604 s"'$axiom' has been ignored because it is not in Horn-ALCHOIQ",
605 // Logger.VERBOSE 605 Logger.VERBOSE
606 // )
607 // Seq()
608 throw new RuntimeException(
609 s"'$axiom' is not currently supported."
610 ) 606 )
607 Seq()
608 // throw new RuntimeException(
609 // s"'$axiom' is not currently supported."
610 // )
611 }
611} 612}
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala
index a9027cf..3d67270 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala
@@ -84,8 +84,9 @@ object RDFoxUtil {
84 val password = "" 84 val password = ""
85 val server = 85 val server =
86 ConnectionFactory.newServerConnection(serverUrl, role, password) 86 ConnectionFactory.newServerConnection(serverUrl, role, password)
87 opts.put("type", "par-complex-nn")
87 if (!server.containsDataStore(datastore)) 88 if (!server.containsDataStore(datastore))
88 server.createDataStore(datastore, "par-complex-nn", opts) 89 server.createDataStore(datastore, opts)
89 val data = server.newDataStoreConnection(datastore) 90 val data = server.newDataStoreConnection(datastore)
90 (server, data) 91 (server, data)
91 } 92 }