ont-api: add OWLOntology#objectPropertyAssertionAxioms(OWLIndividual) graph-optimization, add tests (#12)

sszuev · sszuev · commit 531ea45b36cc · 2020-05-16T20:16:42.000+03:00
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/InternalModel.java b/src/main/java/com/github/owlcs/ontapi/internal/InternalModel.java
@@ -160,6 +160,8 @@ public class InternalModel extends OntGraphModelImpl
             = new AnnotationAssertionBySubject();
     protected final ByObjectSearcher<OWLDataPropertyAssertionAxiom, OWLIndividual> dataAssertionsBySubject
             = new DataAssertionBySubject();
+    protected final ByObjectSearcher<OWLObjectPropertyAssertionAxiom, OWLIndividual> objectAssertionsBySubject
+            = new ObjectAssertionBySubject();
     protected final ByObjectSearcher<OWLSubClassOfAxiom, OWLClass> subClassOfBySubject = new SubClassOfBySubject();
     protected final ByObjectSearcher<OWLSubClassOfAxiom, OWLClass> subClassOfByObject = new SubClassOfByObject();
     protected final ByObjectSearcher<OWLEquivalentClassesAxiom, OWLClass> equivalentClassesByClass = new EquivalentClassesByClass();
@@ -662,6 +664,15 @@ public Stream<OWLDataPropertyAssertionAxiom> listOWLDataPropertyAssertionAxioms(
         return listOWLAxioms(dataAssertionsBySubject, OWLDataPropertyAssertionAxiom.class, subject, config);
     }
 
+    @Override
+    public Stream<OWLObjectPropertyAssertionAxiom> listOWLObjectPropertyAssertionAxioms(OWLIndividual subject) {
+        InternalConfig config = getConfig();
+        if (!useAxiomsSearchOptimization(config)) {
+            return ListAxioms.super.listOWLObjectPropertyAssertionAxioms(subject);
+        }
+        return listOWLAxioms(objectAssertionsBySubject, OWLObjectPropertyAssertionAxiom.class, subject, config);
+    }
+
     @Override
     public Stream<OWLSubClassOfAxiom> listOWLSubClassOfAxiomsBySubject(OWLClass subject) {
         InternalConfig config = getConfig();
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/ListAxioms.java b/src/main/java/com/github/owlcs/ontapi/internal/ListAxioms.java
@@ -125,6 +125,12 @@ default Stream<OWLDifferentIndividualsAxiom> listOWLDifferentIndividualsAxioms(O
         return listOWLNaryAxiomAxiomsByOperand(OWLDifferentIndividualsAxiom.class, operand);
     }
 
+    /**
+     * Lists {@link OWLObjectPropertyAssertionAxiom ObjectPropertyAssertion Axiom}s by the given {@link OWLIndividual individual}-subject.
+     *
+     * @param subject {@link OWLIndividual}, not {@code null}
+     * @return a {@code Stream} of {@link OWLObjectPropertyAssertionAxiom}s
+     */
     default Stream<OWLObjectPropertyAssertionAxiom> listOWLObjectPropertyAssertionAxioms(OWLIndividual subject) {
         return listOWLAxioms(OWLObjectPropertyAssertionAxiom.class).filter(x -> Objects.equals(subject, x.getSubject()));
     }
@@ -134,7 +140,7 @@ default Stream<OWLNegativeObjectPropertyAssertionAxiom> listOWLNegativeObjectPro
     }
 
     /**
-     * Lists {@link OWLDataPropertyAssertionAxiom DataPropertyAssertion Axiom}s by the given {@link OWLIndividual individual}-subjectt.
+     * Lists {@link OWLDataPropertyAssertionAxiom DataPropertyAssertion Axiom}s by the given {@link OWLIndividual individual}-subject.
      *
      * @param subject {@link OWLIndividual}, not {@code null}
      * @return a {@code Stream} of {@link OWLDataPropertyAssertionAxiom}s
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/AnnotationAssertionBySubject.java b/src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/AnnotationAssertionBySubject.java
@@ -14,31 +14,20 @@
 
 package com.github.owlcs.ontapi.internal.searchers.axioms;
 
-import com.github.owlcs.ontapi.config.AxiomsSettings;
-import com.github.owlcs.ontapi.internal.ONTObject;
-import com.github.owlcs.ontapi.internal.ONTObjectFactory;
+import com.github.owlcs.ontapi.internal.AxiomTranslator;
 import com.github.owlcs.ontapi.internal.OWLTopObjectType;
-import com.github.owlcs.ontapi.internal.WriteHelper;
 import com.github.owlcs.ontapi.internal.axioms.AnnotationAssertionTranslator;
-import com.github.owlcs.ontapi.jena.model.OntModel;
-import com.github.owlcs.ontapi.jena.model.OntStatement;
-import org.apache.jena.util.iterator.ExtendedIterator;
 import org.semanticweb.owlapi.model.OWLAnnotationAssertionAxiom;
 import org.semanticweb.owlapi.model.OWLAnnotationSubject;
 
 /**
  * Created by @ssz on 18.04.2020.
  */
-public class AnnotationAssertionBySubject extends BaseByObject<OWLAnnotationAssertionAxiom, OWLAnnotationSubject> {
+public class AnnotationAssertionBySubject extends AssertionBySubject<OWLAnnotationAssertionAxiom, OWLAnnotationSubject> {
     private static final AnnotationAssertionTranslator TRANSLATOR = getTranslator(OWLTopObjectType.ANNOTATION_ASSERTION);
 
     @Override
-    public ExtendedIterator<ONTObject<OWLAnnotationAssertionAxiom>> listONTAxioms(OWLAnnotationSubject subject,
-                                                                                  OntModel model,
-                                                                                  ONTObjectFactory factory,
-                                                                                  AxiomsSettings config) {
-        ExtendedIterator<OntStatement> res = listBySubject(model, WriteHelper.toResource(subject))
-                .filterKeep(x -> TRANSLATOR.testStatement(x, config));
-        return translate(TRANSLATOR, res, factory, config);
+    AxiomTranslator<OWLAnnotationAssertionAxiom> getTranslator() {
+        return TRANSLATOR;
     }
 }
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/AssertionBySubject.java b/src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/AssertionBySubject.java
@@ -0,0 +1,61 @@
+/*
+ * This file is part of the ONT API.
+ * The contents of this file are subject to the LGPL License, Version 3.0.
+ * Copyright (c) 2020, The University of Manchester, owl.cs group.
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with this program.  If not, see http://www.gnu.org/licenses/.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the Apache License, Version 2.0 in which case, the provisions of the Apache License Version 2.0 are applicable instead of those above.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+
+package com.github.owlcs.ontapi.internal.searchers.axioms;
+
+import com.github.owlcs.ontapi.config.AxiomsSettings;
+import com.github.owlcs.ontapi.internal.AxiomTranslator;
+import com.github.owlcs.ontapi.internal.ONTObject;
+import com.github.owlcs.ontapi.internal.ONTObjectFactory;
+import com.github.owlcs.ontapi.internal.WriteHelper;
+import com.github.owlcs.ontapi.jena.model.OntModel;
+import com.github.owlcs.ontapi.jena.model.OntStatement;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.semanticweb.owlapi.model.HasSubject;
+import org.semanticweb.owlapi.model.OWLAxiom;
+import org.semanticweb.owlapi.model.OWLObject;
+
+/**
+ * Created by @ssz on 16.05.2020.
+ *
+ * @param <A> - {@link OWLAxiom} and {@link HasSubject}
+ * @param <S> - {@link OWLObject}
+ */
+abstract class AssertionBySubject<A extends OWLAxiom & HasSubject<S>, S extends OWLObject> extends BaseByObject<A, S> {
+
+    @Override
+    public final ExtendedIterator<ONTObject<A>> listONTAxioms(S subject,
+                                                              OntModel model,
+                                                              ONTObjectFactory factory,
+                                                              AxiomsSettings config) {
+        return listONTAxioms(subject, getTranslator(), model, factory, config);
+    }
+
+    private ExtendedIterator<ONTObject<A>> listONTAxioms(S subject,
+                                                         AxiomTranslator<A> translator,
+                                                         OntModel model,
+                                                         ONTObjectFactory factory,
+                                                         AxiomsSettings config) {
+        ExtendedIterator<OntStatement> res = listBySubject(model, toResource(subject))
+                .filterKeep(x -> translator.testStatement(x, config));
+        return translate(translator, res, factory, config);
+    }
+
+    Resource toResource(S subject) {
+        return WriteHelper.toResource(subject);
+    }
+
+    abstract AxiomTranslator<A> getTranslator();
+}
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/DataAssertionBySubject.java b/src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/DataAssertionBySubject.java
@@ -14,31 +14,27 @@
 
 package com.github.owlcs.ontapi.internal.searchers.axioms;
 
-import com.github.owlcs.ontapi.config.AxiomsSettings;
-import com.github.owlcs.ontapi.internal.ONTObject;
-import com.github.owlcs.ontapi.internal.ONTObjectFactory;
+import com.github.owlcs.ontapi.internal.AxiomTranslator;
 import com.github.owlcs.ontapi.internal.OWLTopObjectType;
 import com.github.owlcs.ontapi.internal.WriteHelper;
 import com.github.owlcs.ontapi.internal.axioms.DataPropertyAssertionTranslator;
-import com.github.owlcs.ontapi.jena.model.OntModel;
-import com.github.owlcs.ontapi.jena.model.OntStatement;
-import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.rdf.model.Resource;
 import org.semanticweb.owlapi.model.OWLDataPropertyAssertionAxiom;
 import org.semanticweb.owlapi.model.OWLIndividual;
 
 /**
  * Created by @ssz on 16.05.2020.
  */
-public class DataAssertionBySubject extends BaseByObject<OWLDataPropertyAssertionAxiom, OWLIndividual> {
+public class DataAssertionBySubject extends AssertionBySubject<OWLDataPropertyAssertionAxiom, OWLIndividual> {
     private static final DataPropertyAssertionTranslator TRANSLATOR = getTranslator(OWLTopObjectType.DATA_PROPERTY_ASSERTION);
 
     @Override
-    public ExtendedIterator<ONTObject<OWLDataPropertyAssertionAxiom>> listONTAxioms(OWLIndividual subject,
-                                                                                    OntModel model,
-                                                                                    ONTObjectFactory factory,
-                                                                                    AxiomsSettings config) {
-        ExtendedIterator<OntStatement> res = listBySubject(model, WriteHelper.toResource(subject))
-                .filterKeep(x -> TRANSLATOR.testStatement(x, config));
-        return translate(TRANSLATOR, res, factory, config);
+    Resource toResource(OWLIndividual subject) {
+        return WriteHelper.toResource(subject);
+    }
+
+    @Override
+    AxiomTranslator<OWLDataPropertyAssertionAxiom> getTranslator() {
+        return TRANSLATOR;
     }
 }
diff --git a/src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/ObjectAssertionBySubject.java b/src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/ObjectAssertionBySubject.java
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the ONT API.
+ * The contents of this file are subject to the LGPL License, Version 3.0.
+ * Copyright (c) 2020, The University of Manchester, owl.cs group.
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with this program.  If not, see http://www.gnu.org/licenses/.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the Apache License, Version 2.0 in which case, the provisions of the Apache License Version 2.0 are applicable instead of those above.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+
+package com.github.owlcs.ontapi.internal.searchers.axioms;
+
+import com.github.owlcs.ontapi.internal.AxiomTranslator;
+import com.github.owlcs.ontapi.internal.OWLTopObjectType;
+import com.github.owlcs.ontapi.internal.WriteHelper;
+import com.github.owlcs.ontapi.internal.axioms.ObjectPropertyAssertionTranslator;
+import org.apache.jena.rdf.model.Resource;
+import org.semanticweb.owlapi.model.OWLIndividual;
+import org.semanticweb.owlapi.model.OWLObjectPropertyAssertionAxiom;
+
+/**
+ * Created by @ssz on 16.05.2020.
+ */
+public class ObjectAssertionBySubject extends AssertionBySubject<OWLObjectPropertyAssertionAxiom, OWLIndividual> {
+    private static final ObjectPropertyAssertionTranslator TRANSLATOR = getTranslator(OWLTopObjectType.OBJECT_PROPERTY_ASSERTION);
+
+    @Override
+    Resource toResource(OWLIndividual subject) {
+        return WriteHelper.toResource(subject);
+    }
+
+    @Override
+    AxiomTranslator<OWLObjectPropertyAssertionAxiom> getTranslator() {
+        return TRANSLATOR;
+    }
+}
diff --git a/src/test/java/com/github/owlcs/ontapi/tests/model/SearchByObjectTest.java b/src/test/java/com/github/owlcs/ontapi/tests/model/SearchByObjectTest.java

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,12 @@ default Stream<OWLDifferentIndividualsAxiom> listOWLDifferentIndividualsAxioms(O`
`125`	`125`	`return listOWLNaryAxiomAxiomsByOperand(OWLDifferentIndividualsAxiom.class, operand);`
`126`	`126`	`}`
`127`	`127`
	`128`	`+ /**`
	`129`	`+ * Lists {@link OWLObjectPropertyAssertionAxiom ObjectPropertyAssertion Axiom}s by the given {@link OWLIndividual individual}-subject.`
	`130`	`+ *`
	`131`	`+ * @param subject {@link OWLIndividual}, not {@code null}`
	`132`	`+ * @return a {@code Stream} of {@link OWLObjectPropertyAssertionAxiom}s`
	`133`	`+ */`
`128`	`134`	`default Stream<OWLObjectPropertyAssertionAxiom> listOWLObjectPropertyAssertionAxioms(OWLIndividual subject) {`
`129`	`135`	`return listOWLAxioms(OWLObjectPropertyAssertionAxiom.class).filter(x -> Objects.equals(subject, x.getSubject()));`
`130`	`136`	`}`
`@@ -134,7 +140,7 @@ default Stream<OWLNegativeObjectPropertyAssertionAxiom> listOWLNegativeObjectPro`
`134`	`140`	`}`
`135`	`141`
`136`	`142`	`/**`
`137`		`- * Lists {@link OWLDataPropertyAssertionAxiom DataPropertyAssertion Axiom}s by the given {@link OWLIndividual individual}-subjectt.`
	`143`	`+ * Lists {@link OWLDataPropertyAssertionAxiom DataPropertyAssertion Axiom}s by the given {@link OWLIndividual individual}-subject.`
`138`	`144`	`*`
`139`	`145`	`* @param subject {@link OWLIndividual}, not {@code null}`
`140`	`146`	`* @return a {@code Stream} of {@link OWLDataPropertyAssertionAxiom}s`