diff options
Diffstat (limited to 'src/main/scala/uk/ac/ox/cs/rsacomb/implicits')
| -rw-r--r-- | src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAtom.scala | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAtom.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAtom.scala index 795e039..ff48f1f 100644 --- a/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAtom.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/implicits/RSAAtom.scala | |||
| @@ -51,19 +51,14 @@ object RSAAtom { | |||
| 51 | import RDFox._ | 51 | import RDFox._ |
| 52 | import JavaCollections._ | 52 | import JavaCollections._ |
| 53 | 53 | ||
| 54 | val name: String = atom.getTupleTableName.getName | 54 | val tt: TupleTableName = atom.getTupleTableName |
| 55 | 55 | ||
| 56 | val args: List[Term] = atom.getArguments | 56 | val args: List[Term] = atom.getArguments |
| 57 | 57 | ||
| 58 | val isRDF: Boolean = | 58 | val isRDF: Boolean = atom.getArguments.length == 3 |
| 59 | name == "http://oxfordsemantic.tech/RDFox#DefaultTriples" | ||
| 60 | 59 | ||
| 61 | val isClassAssertion: Boolean = { | 60 | val isClassAssertion: Boolean = |
| 62 | isRDF && { | 61 | isRDF && atom.getArguments.get(1) == IRI.RDF_TYPE |
| 63 | val pred = atom.getArguments.get(1) | ||
| 64 | pred == IRI.RDF_TYPE | ||
| 65 | } | ||
| 66 | } | ||
| 67 | 62 | ||
| 68 | val isRoleAssertion: Boolean = isRDF && !isClassAssertion | 63 | val isRoleAssertion: Boolean = isRDF && !isClassAssertion |
| 69 | 64 | ||
| @@ -77,18 +72,15 @@ object RSAAtom { | |||
| 77 | case iri: IRI => IRI.create(iri.getIRI :: suffix) | 72 | case iri: IRI => IRI.create(iri.getIRI :: suffix) |
| 78 | case other => other | 73 | case other => other |
| 79 | } | 74 | } |
| 80 | TupleTableAtom.rdf(subj, pred, obj1) | 75 | TupleTableAtom.create(tt, subj, pred, obj1) |
| 81 | } else { | 76 | } else { |
| 82 | val pred1 = pred match { | 77 | val pred1 = pred match { |
| 83 | case iri: IRI => IRI.create(iri.getIRI :: suffix) | 78 | case iri: IRI => IRI.create(iri.getIRI :: suffix) |
| 84 | case other => other | 79 | case other => other |
| 85 | } | 80 | } |
| 86 | TupleTableAtom.rdf(subj, pred1, obj) | 81 | TupleTableAtom.create(tt, subj, pred1, obj) |
| 87 | } | 82 | } |
| 88 | } else { | 83 | } else atom |
| 89 | val ttname = TupleTableName.create(name :: suffix) | ||
| 90 | TupleTableAtom.create(ttname, atom.getArguments()) | ||
| 91 | } | ||
| 92 | 84 | ||
| 93 | def reified(implicit | 85 | def reified(implicit |
| 94 | fresh: DataFactory | 86 | fresh: DataFactory |