diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/CanonicalModel.scala (renamed from src/main/scala/rsacomb/CanonicalModel.scala) | 12 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala (renamed from src/main/scala/rsacomb/FilteringProgram.scala) | 8 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala (renamed from src/main/scala/rsacomb/Main.scala) | 2 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala (renamed from src/main/scala/rsacomb/RSAOntology.scala) | 8 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxAxiomConverter.scala (renamed from src/main/scala/rsacomb/RDFoxAxiomConverter.scala) | 7 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxClassExprConverter.scala (renamed from src/main/scala/rsacomb/RDFoxClassExprConverter.scala) | 9 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxPropertyExprConverter.scala (renamed from src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala) | 6 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxRuleShards.scala (renamed from src/main/scala/rsacomb/RDFoxRuleShards.scala) | 2 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/converter/SkolemStrategy.scala (renamed from src/main/scala/rsacomb/SkolemStrategy.scala) | 2 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/implicits/JavaCollections.scala (renamed from src/main/scala/rsacomb/implicits/JavaCollections.scala) | 2 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RDFox.scala (renamed from src/main/scala/rsacomb/implicits/RDFox.scala) | 2 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAtom.scala (renamed from src/main/scala/rsacomb/RSAAtom.scala) | 6 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAxiom.scala (renamed from src/main/scala/rsacomb/RSAAxiom.scala) | 2 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/suffix/RSASuffix.scala (renamed from src/main/scala/rsacomb/RSASuffix.scala) | 2 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxHelpers.scala (renamed from src/main/scala/rsacomb/util/RDFoxHelpers.scala) | 4 | ||||
-rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/util/RSA.scala (renamed from src/main/scala/rsacomb/RSA.scala) | 4 | ||||
-rw-r--r-- | src/test/scala/uk/ac/ox/cs/rsacomb/CanonicalModelSpec.scala (renamed from src/test/scala/rsacomb/CanonicalModelSpec.scala) | 3 | ||||
-rw-r--r-- | src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala (renamed from src/test/scala/rsacomb/FilteringProgramSpecs.scala) | 3 | ||||
-rw-r--r-- | src/test/scala/uk/ac/ox/cs/rsacomb/OWLAxiomSpec.scala (renamed from src/test/scala/rsacomb/OWLAxiomSpec.scala) | 5 | ||||
-rw-r--r-- | src/test/scala/uk/ac/ox/cs/rsacomb/OWLClassSpec.scala (renamed from src/test/scala/rsacomb/OWLClassSpec.scala) | 8 |
20 files changed, 56 insertions, 41 deletions
diff --git a/src/main/scala/rsacomb/CanonicalModel.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/CanonicalModel.scala index d9e1641..f0f1bf8 100644 --- a/src/main/scala/rsacomb/CanonicalModel.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/CanonicalModel.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb |
2 | 2 | ||
3 | import org.semanticweb.owlapi.model.{OWLObjectInverseOf, OWLObjectProperty} | 3 | import org.semanticweb.owlapi.model.{OWLObjectInverseOf, OWLObjectProperty} |
4 | import org.semanticweb.owlapi.model.{ | 4 | import org.semanticweb.owlapi.model.{ |
@@ -23,8 +23,14 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{ | |||
23 | IRI | 23 | IRI |
24 | } | 24 | } |
25 | 25 | ||
26 | import suffix.{Empty, Forward, Backward, Inverse} | 26 | import uk.ac.ox.cs.rsacomb.converter.{ |
27 | import util.RSA | 27 | SkolemStrategy, |
28 | RDFoxAxiomConverter, | ||
29 | RDFoxPropertyExprConverter | ||
30 | } | ||
31 | import uk.ac.ox.cs.rsacomb.implicits.RSAAxiom | ||
32 | import uk.ac.ox.cs.rsacomb.suffix.{Empty, Forward, Backward, Inverse} | ||
33 | import uk.ac.ox.cs.rsacomb.util.RSA | ||
28 | 34 | ||
29 | class CanonicalModel(val ontology: RSAOntology) extends RSAAxiom { | 35 | class CanonicalModel(val ontology: RSAOntology) extends RSAAxiom { |
30 | 36 | ||
diff --git a/src/main/scala/rsacomb/FilteringProgram.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala index c82dcb6..b154575 100644 --- a/src/main/scala/rsacomb/FilteringProgram.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/FilteringProgram.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb |
2 | 2 | ||
3 | import tech.oxfordsemantic.jrdfox.logic.Datatype | 3 | import tech.oxfordsemantic.jrdfox.logic.Datatype |
4 | import tech.oxfordsemantic.jrdfox.logic.expression.{ | 4 | import tech.oxfordsemantic.jrdfox.logic.expression.{ |
@@ -27,9 +27,9 @@ import tech.oxfordsemantic.jrdfox.logic.sparql.pattern.{ | |||
27 | 27 | ||
28 | import scala.collection.JavaConverters._ | 28 | import scala.collection.JavaConverters._ |
29 | 29 | ||
30 | import implicits.RSAAtom | 30 | import uk.ac.ox.cs.rsacomb.implicits.RSAAtom |
31 | import suffix.{RSASuffix, Forward, Backward} | 31 | import uk.ac.ox.cs.rsacomb.suffix.{RSASuffix, Forward, Backward} |
32 | import util.RSA | 32 | import uk.ac.ox.cs.rsacomb.util.RSA |
33 | 33 | ||
34 | class FilteringProgram(query: SelectQuery, constants: List[Term]) | 34 | class FilteringProgram(query: SelectQuery, constants: List[Term]) |
35 | extends RSAAtom { | 35 | extends RSAAtom { |
diff --git a/src/main/scala/rsacomb/Main.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala index 31dd5a0..c3db99d 100644 --- a/src/main/scala/rsacomb/Main.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb |
2 | 2 | ||
3 | /* Java imports */ | 3 | /* Java imports */ |
4 | import java.io.File | 4 | import java.io.File |
diff --git a/src/main/scala/rsacomb/RSAOntology.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala index 53bc560..ac86e3d 100644 --- a/src/main/scala/rsacomb/RSAOntology.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb |
2 | 2 | ||
3 | /* Java imports */ | 3 | /* Java imports */ |
4 | import java.util.HashMap | 4 | import java.util.HashMap |
@@ -46,8 +46,10 @@ import org.semanticweb.owlapi.dlsyntax.renderer.DLSyntaxObjectRenderer | |||
46 | import tech.oxfordsemantic.jrdfox.logic._ | 46 | import tech.oxfordsemantic.jrdfox.logic._ |
47 | import org.semanticweb.owlapi.model.OWLObjectInverseOf | 47 | import org.semanticweb.owlapi.model.OWLObjectInverseOf |
48 | 48 | ||
49 | import suffix.{Empty, Forward, Backward, Inverse} | 49 | import uk.ac.ox.cs.rsacomb.converter.{RDFoxAxiomConverter, SkolemStrategy} |
50 | import util.{RDFoxHelpers, RSA} | 50 | import uk.ac.ox.cs.rsacomb.implicits.RSAAxiom |
51 | import uk.ac.ox.cs.rsacomb.suffix.{Empty, Forward, Backward, Inverse} | ||
52 | import uk.ac.ox.cs.rsacomb.util.{RDFoxHelpers, RSA} | ||
51 | 53 | ||
52 | object RSAOntology { | 54 | object RSAOntology { |
53 | 55 | ||
diff --git a/src/main/scala/rsacomb/RDFoxAxiomConverter.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxAxiomConverter.scala index 9b78e8e..a8d1ffd 100644 --- a/src/main/scala/rsacomb/RDFoxAxiomConverter.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxAxiomConverter.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb.converter |
2 | 2 | ||
3 | import org.semanticweb.owlapi.model.{ | 3 | import org.semanticweb.owlapi.model.{ |
4 | OWLAxiom, | 4 | OWLAxiom, |
@@ -23,13 +23,12 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{ | |||
23 | 23 | ||
24 | import scala.collection.JavaConverters._ | 24 | import scala.collection.JavaConverters._ |
25 | 25 | ||
26 | import rsacomb.SkolemStrategy | ||
27 | import rsacomb.RDFoxRuleShards | ||
28 | import org.semanticweb.owlapi.model.OWLSubObjectPropertyOfAxiom | 26 | import org.semanticweb.owlapi.model.OWLSubObjectPropertyOfAxiom |
29 | import org.semanticweb.owlapi.model.OWLObjectProperty | 27 | import org.semanticweb.owlapi.model.OWLObjectProperty |
30 | import org.semanticweb.owlapi.model.OWLClassAssertionAxiom | 28 | import org.semanticweb.owlapi.model.OWLClassAssertionAxiom |
31 | 29 | ||
32 | import suffix.{RSASuffix, Empty} | 30 | import uk.ac.ox.cs.rsacomb.RSAOntology |
31 | import uk.ac.ox.cs.rsacomb.suffix.{RSASuffix, Empty} | ||
33 | 32 | ||
34 | object RDFoxAxiomConverter { | 33 | object RDFoxAxiomConverter { |
35 | 34 | ||
diff --git a/src/main/scala/rsacomb/RDFoxClassExprConverter.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxClassExprConverter.scala index f4187ed..c151c9a 100644 --- a/src/main/scala/rsacomb/RDFoxClassExprConverter.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxClassExprConverter.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb.converter |
2 | 2 | ||
3 | import scala.collection.JavaConverters._ | 3 | import scala.collection.JavaConverters._ |
4 | import java.util.stream.{Stream, Collectors} | 4 | import java.util.stream.{Stream, Collectors} |
@@ -29,8 +29,9 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{ | |||
29 | import org.semanticweb.owlapi.model.OWLObjectPropertyExpression | 29 | import org.semanticweb.owlapi.model.OWLObjectPropertyExpression |
30 | import org.semanticweb.owlapi.model.OWLObjectProperty | 30 | import org.semanticweb.owlapi.model.OWLObjectProperty |
31 | 31 | ||
32 | import suffix.{RSASuffix, Empty} | 32 | import uk.ac.ox.cs.rsacomb.RSAOntology |
33 | import util.RSA | 33 | import uk.ac.ox.cs.rsacomb.suffix.{RSASuffix, Empty} |
34 | import uk.ac.ox.cs.rsacomb.util.RSA | ||
34 | 35 | ||
35 | object RDFoxClassExprConverter { | 36 | object RDFoxClassExprConverter { |
36 | 37 | ||
@@ -60,7 +61,7 @@ class RDFoxClassExprConverter( | |||
60 | suffix: RSASuffix | 61 | suffix: RSASuffix |
61 | ) extends OWLClassExpressionVisitorEx[RDFoxRuleShards] { | 62 | ) extends OWLClassExpressionVisitorEx[RDFoxRuleShards] { |
62 | 63 | ||
63 | import implicits.RDFox._ | 64 | import uk.ac.ox.cs.rsacomb.implicits.RDFox._ |
64 | 65 | ||
65 | // OWLClass | 66 | // OWLClass |
66 | override def visit(expr: OWLClass): RDFoxRuleShards = { | 67 | override def visit(expr: OWLClass): RDFoxRuleShards = { |
diff --git a/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxPropertyExprConverter.scala index 826e965..94c7887 100644 --- a/src/main/scala/rsacomb/RDFoxPropertyExprConverter.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxPropertyExprConverter.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb.converter |
2 | 2 | ||
3 | import org.semanticweb.owlapi.model.{OWLPropertyExpression, OWLObjectProperty} | 3 | import org.semanticweb.owlapi.model.{OWLPropertyExpression, OWLObjectProperty} |
4 | import org.semanticweb.owlapi.model.OWLPropertyExpressionVisitorEx | 4 | import org.semanticweb.owlapi.model.OWLPropertyExpressionVisitorEx |
@@ -8,7 +8,7 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{Term, IRI, Literal} | |||
8 | 8 | ||
9 | import org.semanticweb.owlapi.model.OWLObjectInverseOf | 9 | import org.semanticweb.owlapi.model.OWLObjectInverseOf |
10 | 10 | ||
11 | import suffix.{RSASuffix, Inverse} | 11 | import uk.ac.ox.cs.rsacomb.suffix.{RSASuffix, Inverse} |
12 | 12 | ||
13 | class RDFoxPropertyExprConverter( | 13 | class RDFoxPropertyExprConverter( |
14 | term1: Term, | 14 | term1: Term, |
@@ -17,7 +17,7 @@ class RDFoxPropertyExprConverter( | |||
17 | ) extends OWLPropertyExpressionVisitorEx[List[TupleTableAtom]] { | 17 | ) extends OWLPropertyExpressionVisitorEx[List[TupleTableAtom]] { |
18 | 18 | ||
19 | // Automatically converts OWLAPI types into RDFox equivalent types. | 19 | // Automatically converts OWLAPI types into RDFox equivalent types. |
20 | import implicits.RDFox._ | 20 | import uk.ac.ox.cs.rsacomb.implicits.RDFox._ |
21 | 21 | ||
22 | override def visit(expr: OWLObjectProperty): List[TupleTableAtom] = { | 22 | override def visit(expr: OWLObjectProperty): List[TupleTableAtom] = { |
23 | val base = expr.getIRI.getIRIString | 23 | val base = expr.getIRI.getIRIString |
diff --git a/src/main/scala/rsacomb/RDFoxRuleShards.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxRuleShards.scala index b61cc38..c88cf3c 100644 --- a/src/main/scala/rsacomb/RDFoxRuleShards.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/RDFoxRuleShards.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb.converter |
2 | 2 | ||
3 | import tech.oxfordsemantic.jrdfox.logic.datalog.{TupleTableAtom, BodyFormula} | 3 | import tech.oxfordsemantic.jrdfox.logic.datalog.{TupleTableAtom, BodyFormula} |
4 | 4 | ||
diff --git a/src/main/scala/rsacomb/SkolemStrategy.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/SkolemStrategy.scala index a2ad0a1..0d72226 100644 --- a/src/main/scala/rsacomb/SkolemStrategy.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/SkolemStrategy.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb.converter |
2 | 2 | ||
3 | import tech.oxfordsemantic.jrdfox.logic.Datatype | 3 | import tech.oxfordsemantic.jrdfox.logic.Datatype |
4 | import tech.oxfordsemantic.jrdfox.logic.expression.{Literal, IRI} | 4 | import tech.oxfordsemantic.jrdfox.logic.expression.{Literal, IRI} |
diff --git a/src/main/scala/rsacomb/implicits/JavaCollections.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/JavaCollections.scala index 69e825b..3b621f4 100644 --- a/src/main/scala/rsacomb/implicits/JavaCollections.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/JavaCollections.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb.implicits | 1 | package uk.ac.ox.cs.rsacomb.implicits |
2 | 2 | ||
3 | import scala.collection.JavaConverters._ | 3 | import scala.collection.JavaConverters._ |
4 | 4 | ||
diff --git a/src/main/scala/rsacomb/implicits/RDFox.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RDFox.scala index 44b7c01..0462a47 100644 --- a/src/main/scala/rsacomb/implicits/RDFox.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RDFox.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb.implicits | 1 | package uk.ac.ox.cs.rsacomb.implicits |
2 | 2 | ||
3 | import tech.oxfordsemantic.jrdfox.logic.expression.{IRI => RDFoxIRI} | 3 | import tech.oxfordsemantic.jrdfox.logic.expression.{IRI => RDFoxIRI} |
4 | import org.semanticweb.owlapi.model.{IRI => OWLIRI} | 4 | import org.semanticweb.owlapi.model.{IRI => OWLIRI} |
diff --git a/src/main/scala/rsacomb/RSAAtom.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAtom.scala index 8832226..a8afc72 100644 --- a/src/main/scala/rsacomb/RSAAtom.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAtom.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb.implicits | 1 | package uk.ac.ox.cs.rsacomb.implicits |
2 | 2 | ||
3 | import tech.oxfordsemantic.jrdfox.logic.Datatype | 3 | import tech.oxfordsemantic.jrdfox.logic.Datatype |
4 | import tech.oxfordsemantic.jrdfox.logic.expression.{Literal, FunctionCall} | 4 | import tech.oxfordsemantic.jrdfox.logic.expression.{Literal, FunctionCall} |
@@ -10,8 +10,8 @@ import tech.oxfordsemantic.jrdfox.logic.datalog.{ | |||
10 | import tech.oxfordsemantic.jrdfox.logic.expression.{IRI} | 10 | import tech.oxfordsemantic.jrdfox.logic.expression.{IRI} |
11 | import scala.collection.JavaConverters._ | 11 | import scala.collection.JavaConverters._ |
12 | 12 | ||
13 | import rsacomb.suffix.{RSASuffix, Nth} | 13 | import uk.ac.ox.cs.rsacomb.suffix.{RSASuffix, Nth} |
14 | import rsacomb.RSAOntology | 14 | import uk.ac.ox.cs.rsacomb.RSAOntology |
15 | 15 | ||
16 | /* Is this the best way to determine if an atom is an RDF triple? | 16 | /* Is this the best way to determine if an atom is an RDF triple? |
17 | * Note that we can't use `getNumberOfArguments()` because is not | 17 | * Note that we can't use `getNumberOfArguments()` because is not |
diff --git a/src/main/scala/rsacomb/RSAAxiom.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAxiom.scala index 08de5b7..e39d5b2 100644 --- a/src/main/scala/rsacomb/RSAAxiom.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAxiom.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb | 1 | package uk.ac.ox.cs.rsacomb.implicits |
2 | 2 | ||
3 | /* Java imports */ | 3 | /* Java imports */ |
4 | import org.semanticweb.owlapi.model.{ | 4 | import org.semanticweb.owlapi.model.{ |
diff --git a/src/main/scala/rsacomb/RSASuffix.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/suffix/RSASuffix.scala index ce36b10..b22910b 100644 --- a/src/main/scala/rsacomb/RSASuffix.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/suffix/RSASuffix.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb.suffix | 1 | package uk.ac.ox.cs.rsacomb.suffix |
2 | 2 | ||
3 | import org.semanticweb.owlapi.model.{ | 3 | import org.semanticweb.owlapi.model.{ |
4 | OWLPropertyExpression, | 4 | OWLPropertyExpression, |
diff --git a/src/main/scala/rsacomb/util/RDFoxHelpers.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxHelpers.scala index 9856e27..fd9e1c5 100644 --- a/src/main/scala/rsacomb/util/RDFoxHelpers.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxHelpers.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb.util | 1 | package uk.ac.ox.cs.rsacomb.util |
2 | 2 | ||
3 | import java.util.{Map => JMap, HashMap => JHashMap} | 3 | import java.util.{Map => JMap, HashMap => JHashMap} |
4 | import java.io.StringReader | 4 | import java.io.StringReader |
@@ -12,7 +12,7 @@ import tech.oxfordsemantic.jrdfox.formats.SPARQLParser | |||
12 | import tech.oxfordsemantic.jrdfox.logic.expression.Resource | 12 | import tech.oxfordsemantic.jrdfox.logic.expression.Resource |
13 | import tech.oxfordsemantic.jrdfox.logic.sparql.statement.SelectQuery | 13 | import tech.oxfordsemantic.jrdfox.logic.sparql.statement.SelectQuery |
14 | 14 | ||
15 | import rsacomb.suffix.Nth | 15 | import uk.ac.ox.cs.rsacomb.suffix.Nth |
16 | 16 | ||
17 | object RDFoxHelpers { | 17 | object RDFoxHelpers { |
18 | 18 | ||
diff --git a/src/main/scala/rsacomb/RSA.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RSA.scala index ab4f539..f9ff59b 100644 --- a/src/main/scala/rsacomb/RSA.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RSA.scala | |||
@@ -1,4 +1,4 @@ | |||
1 | package rsacomb.util | 1 | package uk.ac.ox.cs.rsacomb.util |
2 | 2 | ||
3 | /* Java imports */ | 3 | /* Java imports */ |
4 | import java.util.Map | 4 | import java.util.Map |
@@ -18,7 +18,7 @@ import org.semanticweb.owlapi.model.{ | |||
18 | OWLObjectPropertyExpression | 18 | OWLObjectPropertyExpression |
19 | } | 19 | } |
20 | 20 | ||
21 | import rsacomb.suffix.RSASuffix | 21 | import uk.ac.ox.cs.rsacomb.suffix.RSASuffix |
22 | 22 | ||
23 | // Debug only | 23 | // Debug only |
24 | import scala.collection.JavaConverters._ | 24 | import scala.collection.JavaConverters._ |
diff --git a/src/test/scala/rsacomb/CanonicalModelSpec.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/CanonicalModelSpec.scala index 06602e3..376729c 100644 --- a/src/test/scala/rsacomb/CanonicalModelSpec.scala +++ b/src/test/scala/uk/ac/ox/cs/rsacomb/CanonicalModelSpec.scala | |||
@@ -14,7 +14,8 @@ import tech.oxfordsemantic.jrdfox.logic.expression.Variable | |||
14 | 14 | ||
15 | import scala.collection.JavaConverters._ | 15 | import scala.collection.JavaConverters._ |
16 | 16 | ||
17 | import rsacomb.util.{RDFoxHelpers, RSA} | 17 | import uk.ac.ox.cs.rsacomb.RSAOntology |
18 | import uk.ac.ox.cs.rsacomb.util.{RDFoxHelpers, RSA} | ||
18 | 19 | ||
19 | object Ontology1_CanonicalModelSpec { | 20 | object Ontology1_CanonicalModelSpec { |
20 | 21 | ||
diff --git a/src/test/scala/rsacomb/FilteringProgramSpecs.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala index 66c1cae..49abd48 100644 --- a/src/test/scala/rsacomb/FilteringProgramSpecs.scala +++ b/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala | |||
@@ -14,7 +14,8 @@ import tech.oxfordsemantic.jrdfox.Prefixes | |||
14 | 14 | ||
15 | import scala.collection.JavaConverters._ | 15 | import scala.collection.JavaConverters._ |
16 | 16 | ||
17 | import rsacomb.util.RDFoxHelpers | 17 | import uk.ac.ox.cs.rsacomb.FilteringProgram |
18 | import uk.ac.ox.cs.rsacomb.util.RDFoxHelpers | ||
18 | 19 | ||
19 | object FilteringProgramSpec { | 20 | object FilteringProgramSpec { |
20 | 21 | ||
diff --git a/src/test/scala/rsacomb/OWLAxiomSpec.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/OWLAxiomSpec.scala index 65333f5..8aee03d 100644 --- a/src/test/scala/rsacomb/OWLAxiomSpec.scala +++ b/src/test/scala/uk/ac/ox/cs/rsacomb/OWLAxiomSpec.scala | |||
@@ -36,7 +36,8 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{ | |||
36 | import org.semanticweb.owlapi.model.{IRI => OWLIRI} | 36 | import org.semanticweb.owlapi.model.{IRI => OWLIRI} |
37 | import tech.oxfordsemantic.jrdfox.logic.expression.{IRI => RDFIRI} | 37 | import tech.oxfordsemantic.jrdfox.logic.expression.{IRI => RDFIRI} |
38 | 38 | ||
39 | import rsacomb.util.RSA | 39 | import uk.ac.ox.cs.rsacomb.converter.{RDFoxAxiomConverter, SkolemStrategy} |
40 | import uk.ac.ox.cs.rsacomb.util.RSA | ||
40 | 41 | ||
41 | object OWLAxiomSpec { | 42 | object OWLAxiomSpec { |
42 | 43 | ||
@@ -183,7 +184,7 @@ class OWLAxiomSpec extends AnyFlatSpec with Matchers with LoneElement { | |||
183 | // Import required data | 184 | // Import required data |
184 | import OWLAxiomSpec._ | 185 | import OWLAxiomSpec._ |
185 | // Implicit convertion from IRI in OWLAPI to IRI in JRDFox | 186 | // Implicit convertion from IRI in OWLAPI to IRI in JRDFox |
186 | import rsacomb.implicits.RDFox._ | 187 | import uk.ac.ox.cs.rsacomb.implicits.RDFox._ |
187 | 188 | ||
188 | // OWLSubClassOfAxiom #1 | 189 | // OWLSubClassOfAxiom #1 |
189 | axiom_OWLSubClassOf1.toString should "be converted into a singleton List[Rule]" in { | 190 | axiom_OWLSubClassOf1.toString should "be converted into a singleton List[Rule]" in { |
diff --git a/src/test/scala/rsacomb/OWLClassSpec.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/OWLClassSpec.scala index 27e0872..459fe21 100644 --- a/src/test/scala/rsacomb/OWLClassSpec.scala +++ b/src/test/scala/uk/ac/ox/cs/rsacomb/OWLClassSpec.scala | |||
@@ -33,8 +33,12 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{ | |||
33 | Literal | 33 | Literal |
34 | } | 34 | } |
35 | 35 | ||
36 | import rsacomb.RDFoxRuleShards | 36 | import uk.ac.ox.cs.rsacomb.converter.{ |
37 | import rsacomb.util.RSA | 37 | RDFoxRuleShards, |
38 | RDFoxClassExprConverter, | ||
39 | SkolemStrategy | ||
40 | } | ||
41 | import uk.ac.ox.cs.rsacomb.util.RSA | ||
38 | 42 | ||
39 | object OWLClassSpec { | 43 | object OWLClassSpec { |
40 | 44 | ||