ont-api: add OWLOntology#objectPropertyRangeAxioms(OWLObjectExpression) optimization (issue #12) + tests

Author: sszuev

src/main/java/com/github/owlcs/ontapi/internal/InternalModel.java

@@ -162,6 +162,8 @@ public class InternalModel extends OntGraphModelImpl
             = new DataAssertionBySubject();
     protected final ByObjectSearcher<OWLObjectPropertyAssertionAxiom, OWLIndividual> objectAssertionsBySubject
             = new ObjectAssertionBySubject();
+    protected final ByObjectSearcher<OWLObjectPropertyRangeAxiom, OWLObjectPropertyExpression> objectPropertyRangeByProperty
+            = new ObjectPropertyRangeBySubject();
     protected final ByObjectSearcher<OWLSubClassOfAxiom, OWLClass> subClassOfBySubject = new SubClassOfBySubject();
     protected final ByObjectSearcher<OWLSubClassOfAxiom, OWLClass> subClassOfByObject = new SubClassOfByObject();
     protected final ByObjectSearcher<OWLEquivalentClassesAxiom, OWLClass> equivalentClassesByClass
@@ -679,6 +681,15 @@ public Stream<OWLObjectPropertyAssertionAxiom> listOWLObjectPropertyAssertionAxi
         return listOWLAxioms(objectAssertionsBySubject, OWLObjectPropertyAssertionAxiom.class, subject, config);
     }
 
+    @Override
+    public Stream<OWLObjectPropertyRangeAxiom> listOWLObjectPropertyRangeAxioms(OWLObjectPropertyExpression subject) {
+        InternalConfig config = getConfig();
+        if (!ObjectPropertyRangeBySubject.isSupported(subject) || !useAxiomsSearchOptimization(config)) {
+            return ListAxioms.super.listOWLObjectPropertyRangeAxioms(subject);
+        }
+        return listOWLAxioms(objectPropertyRangeByProperty, OWLObjectPropertyRangeAxiom.class, subject, config);
+    }
+
     @Override
     public Stream<OWLClassAssertionAxiom> listOWLClassAssertionAxioms(OWLIndividual subject) {
         InternalConfig config = getConfig();

src/main/java/com/github/owlcs/ontapi/internal/ListAxioms.java

@@ -186,6 +186,13 @@ default Stream<OWLObjectPropertyDomainAxiom> listOWLObjectPropertyDomainAxioms(O
         return listOWLPropertyAxioms(OWLObjectPropertyDomainAxiom.class, subject);
     }
 
+    /**
+     * Lists {@link OWLObjectPropertyRangeAxiom ObjectPropertyRange Axiom}s
+     * by the given {@link OWLObjectPropertyExpression property}-subject.
+     *
+     * @param subject {@link OWLObjectPropertyExpression}, not {@code null}
+     * @return a {@code Stream} of {@link OWLObjectPropertyRangeAxiom}s
+     */
     default Stream<OWLObjectPropertyRangeAxiom> listOWLObjectPropertyRangeAxioms(OWLObjectPropertyExpression subject) {
         return listOWLPropertyAxioms(OWLObjectPropertyRangeAxiom.class, subject);
     }

src/main/java/com/github/owlcs/ontapi/internal/axioms/ObjectPropertyRangeTranslator.java

@@ -49,7 +49,7 @@ Class<OntObjectProperty> getView() {
     }
 
     @Override
-    protected boolean filter(OntStatement statement, AxiomsSettings config) {
+    public boolean filter(OntStatement statement, AxiomsSettings config) {
         return super.filter(statement, config) && statement.getObject().canAs(OntClass.class);
     }
 

src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/BaseByObject.java

@@ -62,7 +62,19 @@ static Resource asResource(OWLClassExpression clazz) {
         throw new OntApiException.Unsupported("Unsupported class-expression " + clazz);
     }
 
+    static Resource asResource(OWLObjectPropertyExpression property) {
+        if (property.isOWLObjectProperty()) return asResource((OWLEntity) property.asOWLObjectProperty());
+        if (property instanceof ONTExpressionImpl) {
+            return new ResourceImpl(((ONTExpressionImpl<?>) property).asNode(), null);
+        }
+        throw new OntApiException.Unsupported("Unsupported object-expression " + property);
+    }
+
     public static boolean isSupported(OWLClassExpression clazz) {
         return clazz.isOWLClass() || clazz instanceof ONTExpressionImpl;
     }
+
+    public static boolean isSupported(OWLObjectPropertyExpression property) {
+        return property.isOWLObjectProperty() || property instanceof ONTExpressionImpl;
+    }
 }

src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/ObjectPropertyRangeBySubject.java

@@ -0,0 +1,42 @@
+/*
+ * 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.ONTObject;
+import com.github.owlcs.ontapi.internal.ONTObjectFactory;
+import com.github.owlcs.ontapi.internal.OWLTopObjectType;
+import com.github.owlcs.ontapi.internal.axioms.ObjectPropertyRangeTranslator;
+import com.github.owlcs.ontapi.jena.model.OntModel;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.vocabulary.RDFS;
+import org.semanticweb.owlapi.model.OWLObjectPropertyExpression;
+import org.semanticweb.owlapi.model.OWLObjectPropertyRangeAxiom;
+
+/**
+ * Created by @ssz on 17.05.2020.
+ */
+public class ObjectPropertyRangeBySubject extends BaseByObject<OWLObjectPropertyRangeAxiom, OWLObjectPropertyExpression> {
+    private static final ObjectPropertyRangeTranslator TRANSLATOR = getTranslator(OWLTopObjectType.OBJECT_PROPERTY_RANGE);
+
+    @Override
+    public ExtendedIterator<ONTObject<OWLObjectPropertyRangeAxiom>> listONTAxioms(OWLObjectPropertyExpression subject,
+                                                                                  OntModel model,
+                                                                                  ONTObjectFactory factory,
+                                                                                  AxiomsSettings config) {
+        return translate(TRANSLATOR, listBySubjectAndPredicate(model, asResource(subject), RDFS.range)
+                .filterKeep(s -> TRANSLATOR.filter(s, config)), factory, config);
+    }
+}

src/main/java/com/github/owlcs/ontapi/internal/searchers/axioms/SubClassOfByOperand.java

@@ -39,7 +39,6 @@ public final ExtendedIterator<ONTObject<OWLSubClassOfAxiom>> listONTAxioms(OWLCl
                                                                                OntModel model,
                                                                                ONTObjectFactory factory,
                                                                                AxiomsSettings config) {
-        return translate(TRANSLATOR, listStatements(model, asResource(clazz))
-                .filterKeep(TRANSLATOR::filter), factory, config);
+        return translate(TRANSLATOR, listStatements(model, asResource(clazz)).filterKeep(TRANSLATOR::filter), factory, config);
     }
 }

src/test/java/com/github/owlcs/ontapi/tests/model/SearchByObjectTest.java

@@ -98,6 +98,11 @@ public void testObjectPropertyAssertionAxioms() {
                 x -> Stream.concat(x.individualsInSignature(), x.anonymousIndividuals()));
     }
 
+    @Test
+    public void testObjectPropertyRangeAxioms() {
+        data.doTest(T.OBJECT_PROPERTY_RANGE_BY_SUBJECT, HasObjectPropertiesInSignature::objectPropertiesInSignature);
+    }
+
     @Test
     public void testClassAssertionAxiomsForIndividual() {
         data.doTest(T.CLASS_ASSERTION_BY_SUBJECT,
@@ -120,7 +125,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(-3513486065L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(-3513486065L)
+                T.CLASS_ASSERTION_BY_OBJECT.of(-3513486065L),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(-5171741903L)
         ),
         FAMILY(ModelData.FAMILY,
                 T.DECLARATIONS.of(34226271096L),
@@ -132,7 +138,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(-46062903685L),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(-44647629109L),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(-2344424939L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(-2344424939L)
+                T.CLASS_ASSERTION_BY_OBJECT.of(-2344424939L),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(11112139379L)
         ),
         PEOPLE(ModelData.PEOPLE,
                 T.DECLARATIONS.of(-31040926516L),
@@ -144,7 +151,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(-1008566325L),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(295642609L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(295642609L) // see https://github.com/owlcs/owlapi/issues/930
+                T.CLASS_ASSERTION_BY_OBJECT.of(295642609L), // see https://github.com/owlcs/owlapi/issues/930
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(-2697317876L)
         ),
         CAMERA(ModelData.CAMERA,
                 T.DECLARATIONS.of(2967944221L),
@@ -156,7 +164,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(-546744276L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(-546744276L)
+                T.CLASS_ASSERTION_BY_OBJECT.of(-546744276L),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(-4417906154L)
         ),
         KOALA(ModelData.KOALA,
                 T.DECLARATIONS.of(6488467972L),
@@ -168,7 +177,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(-6315703213L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(-6315703213L)
+                T.CLASS_ASSERTION_BY_OBJECT.of(-6315703213L),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(166159343L)
         ),
         TRAVEL(ModelData.TRAVEL,
                 T.DECLARATIONS.of(-25825023334L),
@@ -180,7 +190,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(1580148819L),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(156661309L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(156661309L)
+                T.CLASS_ASSERTION_BY_OBJECT.of(156661309L),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(3821903939L)
         ),
         WINE(ModelData.WINE,
                 T.DECLARATIONS.of(20065711780L),
@@ -192,7 +203,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(2039350484L),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(24229827352L),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(-13302103928L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(-13302103928L)
+                T.CLASS_ASSERTION_BY_OBJECT.of(-13302103928L),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(-3535340229L)
         ),
         FOOD(ModelData.FOOD,
                 T.DECLARATIONS.of(6794851452L),
@@ -204,7 +216,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(696330992L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(696330992L)
+                T.CLASS_ASSERTION_BY_OBJECT.of(696330992L),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(-144528768L)
         ),
         NCBITAXON_CUT(ModelData.NCBITAXON_CUT,
                 T.DECLARATIONS.of(244310200631L),
@@ -216,7 +229,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(-22700580140L),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(),
-                T.CLASS_ASSERTION_BY_OBJECT.of()
+                T.CLASS_ASSERTION_BY_OBJECT.of(),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of(-5754775670L)
         ),
         HP_CUT(ModelData.HP_CUT,
                 T.DECLARATIONS.of(-14640456193L),
@@ -228,7 +242,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(),
-                T.CLASS_ASSERTION_BY_OBJECT.of()
+                T.CLASS_ASSERTION_BY_OBJECT.of(),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of()
         ),
         FAMILY_PEOPLE_UNION(ModelData.FAMILY_PEOPLE_UNION,
                 T.DECLARATIONS.of(-637777500L),
@@ -240,7 +255,8 @@ enum TestData {
                 T.DATA_PROPERTY_ASSERTION_BY_SUBJECT.of(-2596921457L),
                 T.OBJECT_PROPERTY_ASSERTION_BY_SUBJECT.of(),
                 T.CLASS_ASSERTION_BY_SUBJECT.of(-25907713L),
-                T.CLASS_ASSERTION_BY_OBJECT.of(-25907713L)
+                T.CLASS_ASSERTION_BY_OBJECT.of(-25907713L),
+                T.OBJECT_PROPERTY_RANGE_BY_SUBJECT.of()
         ),
         ;
         private final ModelData resource;
@@ -328,7 +344,12 @@ Stream<? extends OWLObject> listAxioms(OWLOntology ont, OWLObject param) {
                 return ont.classAssertionAxioms((OWLClassExpression) param);
             }
         },
-        ;
+        OBJECT_PROPERTY_RANGE_BY_SUBJECT {
+            @Override
+            Stream<? extends OWLObject> listAxioms(OWLOntology ont, OWLObject param) {
+                return ont.objectPropertyRangeAxioms((OWLObjectPropertyExpression) param);
+            }
+        };
 
         private ByPrimitiveTester of() {
             return of(0);