remove sourceOwlManager.getOntologies() loops

ncbo · Dec 21, 2022 · e0ad8c7 · e0ad8c7
1 parent 5a17c74
commit e0ad8c7
Showing 1 changed file with 52 additions and 55 deletions.
diff --git a/src/main/java/org/stanford/ncbo/owlapi/wrapper/OntologyParser.java b/src/main/java/org/stanford/ncbo/owlapi/wrapper/OntologyParser.java
@@ -206,65 +206,62 @@ private boolean buildOWLOntology(OWLOntology masterOntology, boolean isOBO) {
 			return false;
 		}
 
-		for (OWLOntology sourceOnt : sourceOwlManager.getOntologies()) {
-			IRI documentIRI = sourceOwlManager.getOntologyDocumentIRI(sourceOnt);
-
-			addGroundMetadata(documentIRI, fact, sourceOnt);
-			generateGroundTriplesForAxioms(allAxioms, fact, sourceOnt);
-
-			if (isOBO) {
-				if (!documentIRI.toString().startsWith("owlapi:ontology")) {
-					generateSKOSInObo(allAxioms, fact, sourceOnt);
-				}
-			}
-
-			boolean isPrefixedOWL = sourceOwlManager.getOntologyFormat(sourceOnt).isPrefixOWLOntologyFormat();
-			log.info("isPrefixOWLOntologyFormat: {}", isPrefixedOWL);
-			if (isPrefixedOWL == true && !isOBO) {
-				generateSKOSInOwl(allAxioms, fact, sourceOnt);
-			}
-		}
-
-		targetOwlManager.addAxioms(targetOwlOntology, allAxioms);
-		for (OWLAnnotation ann : targetOwlOntology.getAnnotations()) {
+        IRI documentIRI = sourceOwlManager.getOntologyDocumentIRI(masterOntology);
+
+        addGroundMetadata(documentIRI, fact, masterOntology);
+        generateGroundTriplesForAxioms(allAxioms, fact, masterOntology);
+
+        if (isOBO && !documentIRI.toString().startsWith("owlapi:ontology")) {
+            generateSKOSInObo(allAxioms, fact, masterOntology);
+        }
+
+        boolean isPrefixedOWL = sourceOwlManager.getOntologyFormat(masterOntology).isPrefixOWLOntologyFormat();
+        log.info("isPrefixOWLOntologyFormat: {}", isPrefixedOWL);
+        if (isPrefixedOWL && !isOBO) {
+            generateSKOSInOwl(allAxioms, fact, masterOntology);
+        }
+
+
+        targetOwlManager.addAxioms(targetOwlOntology, allAxioms);
+        for (OWLAnnotation ann : targetOwlOntology.getAnnotations()) {
+            AddOntologyAnnotation addAnn = new AddOntologyAnnotation(targetOwlOntology, ann);
+            targetOwlManager.applyChange(addAnn);
+        }
+
+        if (isOBO) {
+            String oboVersion = parserInvocation.getOBOVersion();
+            if (oboVersion != null) {
+                log.info("Adding version: {}", oboVersion);
+                OWLAnnotationProperty prop = fact.getOWLAnnotationProperty(IRI.create(OWLRDFVocabulary.OWL_VERSION_INFO.toString()));
+                IRI versionSubjectIRI = IRI.create(VERSION_SUBJECT);
+                OWLAnnotationAssertionAxiom annVersion = fact.getOWLAnnotationAssertionAxiom(prop, versionSubjectIRI, fact.getOWLLiteral(oboVersion));
+                targetOwlManager.addAxiom(targetOwlOntology, annVersion);
+            }
+        }
+
+		addOntologyAnnotations(masterOntology);
+        escapeXMLLiterals(targetOwlOntology);
+
+        OWLReasonerFactory reasonerFactory = new StructuralReasonerFactory();
+        OWLReasoner reasoner = reasonerFactory.createReasoner(targetOwlOntology);
+        InferredSubClassAxiomGenerator isc = new InferredSubClassAxiomGenerator();
+        Set<OWLSubClassOfAxiom> subAxs = isc.createAxioms(targetOwlOntology.getOWLOntologyManager().getOWLDataFactory(), reasoner);
+        targetOwlManager.addAxioms(targetOwlOntology, subAxs);
+        deprecateBranch();
+
+        log.info("isOBO: {}", isOBO);
+        if (isOBO) {
+            replicateHierarchyAsTreeview(fact);
+        }
+        return true;
+    }
+
+	private void addOntologyAnnotations(OWLOntology masterOntology){
+		for (OWLAnnotation ann : masterOntology.getAnnotations()) {
 			AddOntologyAnnotation addAnn = new AddOntologyAnnotation(targetOwlOntology, ann);
 			targetOwlManager.applyChange(addAnn);
 		}
-
-		if (isOBO) {
-			String oboVersion = parserInvocation.getOBOVersion();
-			if (oboVersion != null) {
-				log.info("Adding version: {}", oboVersion);
-				OWLAnnotationProperty prop = fact.getOWLAnnotationProperty(IRI.create(OWLRDFVocabulary.OWL_VERSION_INFO.toString()));
-				IRI versionSubjectIRI = IRI.create(VERSION_SUBJECT);
-				OWLAnnotationAssertionAxiom annVersion = fact.getOWLAnnotationAssertionAxiom(prop, versionSubjectIRI, fact.getOWLLiteral(oboVersion));
-				targetOwlManager.addAxiom(targetOwlOntology, annVersion);
-			}
-		}
-
-		for (OWLOntology sourceOnt : sourceOwlManager.getOntologies()) {
-			for (OWLAnnotation ann : sourceOnt.getAnnotations()) {
-				AddOntologyAnnotation addAnn = new AddOntologyAnnotation(targetOwlOntology, ann);
-				targetOwlManager.applyChange(addAnn);
-			}
-		}
-
-		escapeXMLLiterals(targetOwlOntology);
-
-		OWLReasonerFactory reasonerFactory = new StructuralReasonerFactory();
-		OWLReasoner reasoner = reasonerFactory.createReasoner(targetOwlOntology);
- 		InferredSubClassAxiomGenerator isc = new InferredSubClassAxiomGenerator();
-		Set<OWLSubClassOfAxiom> subAxs = isc.createAxioms(targetOwlOntology.getOWLOntologyManager().getOWLDataFactory(), reasoner);
-		targetOwlManager.addAxioms(targetOwlOntology, subAxs);
-		deprecateBranch();
-
-		log.info("isOBO: {}", isOBO);
-		if (isOBO) {
-			replicateHierarchyAsTreeview(fact);
-		}
-		return true;
 	}
-
 	private void replicateHierarchyAsTreeview(OWLDataFactory fact) {
 		Set<OWLAxiom> treeViewAxs = new HashSet<OWLAxiom>();
 		for (OWLAxiom axiom : targetOwlOntology.getAxioms()) {