From f4a430901134cc260a06ccabf6e0d6ad22342f32 Mon Sep 17 00:00:00 2001 From: Christopher Weedall <5010253+cweedall@users.noreply.github.com> Date: Tue, 7 May 2024 14:32:30 -0500 Subject: [PATCH] remove functional check; done via EntitySearcher.isFunctional() instead --- src/main/java/edu/isi/oba/MapperSchema.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/isi/oba/MapperSchema.java b/src/main/java/edu/isi/oba/MapperSchema.java index bb97f71..681e774 100644 --- a/src/main/java/edu/isi/oba/MapperSchema.java +++ b/src/main/java/edu/isi/oba/MapperSchema.java @@ -192,15 +192,10 @@ private Map getDataProperties() { } if (inspect) { - Boolean isFunctional = false; + boolean isFunctional = EntitySearcher.isFunctional(odp, this.ontologies.stream()); + for (OWLOntology ontology: this.ontologies) { ranges.addAll(ontology.getDataPropertyRangeAxioms(odp)); - functional = ontology.getAxioms(AxiomType.FUNCTIONAL_DATA_PROPERTY); - for (OWLFunctionalDataPropertyAxiom functionalAxiom:functional) { - if (functionalAxiom.getProperty().equals(odp)) { - isFunctional = true; - } - } } if (ranges.isEmpty()) { @@ -321,17 +316,11 @@ private Map getObjectProperties() { } if (inspect) { - Boolean isFunctional = false; + boolean isFunctional = EntitySearcher.isFunctional(odp, this.ontologies.stream()); + Set ranges = new HashSet<>(); for (OWLOntology ontology: this.ontologies) { ranges.addAll(ontology.getObjectPropertyRangeAxioms(odp)); - - functional = ontology.getAxioms(AxiomType.FUNCTIONAL_OBJECT_PROPERTY); - for (OWLFunctionalObjectPropertyAxiom functionalAxiom:functional) { - if (functionalAxiom.getProperty().equals(odp)) { - isFunctional = true; - } - } } if (ranges.isEmpty()) {