Merge pull request #1781 from OpenEnergyPlatform/releases-v2.1.0

Merge release 2.1.0 to master
OpenEnergyPlatform · Dec 5, 2023 · b49171b · b49171b
2 parents c87762e + a6a1a8e
commit b49171b
Show file tree

Hide file tree

Showing 16 changed files with 2,401 additions and 1,739 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -4,16 +4,15 @@ Describe the findings of the discussion in the issue or meeting.
 
 ## Type of change (CHANGELOG.md)
 
-### Added
+### Add
 - Added a new class [#](https://github.com/OpenEnergyPlatform/ontology/issues/)
 
-### Updated
+### Update
 - Updated a definition [#](https://github.com/OpenEnergyPlatform/ontology/issues/)
 
-### Removed
+### Remove
 - Removed a broken link [#](https://github.com/OpenEnergyPlatform/ontology/issues/)
 
-
 ## Workflow checklist
 
 ### Automation

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file.
 The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+
+## [2.1.0] - 2023-12-05
+
+### Added
+- resilience, power system resilience, power system (#1744)
+- service product role, service product (#1748)
+- region of relevance, study subregion role, study region role, interacting region role, considered region role (#1749)
+- import from IAO: time stamped measurement datum, action specification, data format specification, objective specification, study design, software application, software library, software method, software module, software script, document part, journal article, version number, cartesian spatial coordinate datum, one dimensional cartesian spatial coordinate datum, two dimensional cartesian spatial coordinate datum, three dimensional cartesian spatial coordinate datum, has time stamp (#1754)
+- fuel blending quota, fuel quota blending value (#1763)
+- study report due to legal obligation (#1777)
+- market share and market share value (#1779)
+
+### Changed
+- subregion, study region, study subregion, interacting region, considered region (#1749)
+- model factsheet (#1751)
+- is connected to, has sink, has source (#1762)
+- temperature, pressure (#1767)
+- carbon capture and storage technology (#1768)
+- power rating, power capacity (#1770)
+- boiler (#1771)
+- B7, E10 (#1774)
+- data descriptor (#1775)
+- target description, policy instrument, policy (#1778)
+
 ## [2.0.1] - 2023-10-26
 
 ### Changed

diff --git a/CITATION.cff b/CITATION.cff
@@ -146,7 +146,7 @@ authors:
 title: "Open Energy Ontology (OEO)"
 type: software
 license: CC0-1.0
-version: 2.0.1
+version: 2.1.0
 doi:
-date-released: 2023-10-26
+date-released: 2023-12-05
 url: "https://github.com/OpenEnergyPlatform/ontology"
diff --git a/Makefile b/Makefile
@@ -50,12 +50,14 @@ endef
 
 .PHONY: all clean base merge directories
 
-all: base merge
+all: base merge closure
 
 base: | directories $(VERSIONDIR)/catalog-v001.xml build/robot.jar $(OWL_COPY) $(OMN_COPY) $(OMN_TRANSLATE)
 
 merge: | $(VERSIONDIR)/oeo-full.omn
 
+closure: | $(VERSIONDIR)/oeo-closure.owl
+
 clean:
 	- $(RM) -r $(VERSIONDIR) $(ROBOT_PATH)
 
@@ -73,7 +75,7 @@ $(VERSIONDIR)/catalog-v001.xml: src/ontology/catalog-v001.xml
 	sed -i -E "s/edits\//modules\//m" $@
 
 build/robot.jar: | build
-	curl -L -o $@ https://github.com/ontodev/robot/releases/download/v1.4.1/robot.jar
+	curl -L -o $@ https://github.com/ontodev/robot/releases/download/v1.9.2/robot.jar
 
 
 $(VERSIONDIR)/%.owl: $(VERSIONDIR)/%.omn
@@ -105,3 +107,7 @@ $(VERSIONDIR)/oeo-full.owl : | base
 $(VERSIONDIR)/oeo-full.omn : $(VERSIONDIR)/oeo-full.owl
 	$(call translate_to_omn,$@,$<)
 	$(call replace_owls,$@)
+
+$(VERSIONDIR)/oeo-closure.owl : $(VERSIONDIR)/oeo-full.owl
+	$(ROBOT) reason --input $< --reasoner hermit --catalog $(VERSIONDIR)/catalog-v001.xml --axiom-generators "SubClass EquivalentClass DataPropertyCharacteristic EquivalentDataProperties SubDataProperty ClassAssertion EquivalentObjectProperty InverseObjectProperties ObjectPropertyCharacteristic SubObjectProperty ObjectPropertyRange ObjectPropertyDomain" --include-indirect true annotate --ontology-iri http://openenergy-platform.org/ontology/oeo/ --output $@
+	$(ROBOT) merge --catalog $(VERSIONDIR)/catalog-v001.xml --input $< --input $@ annotate --ontology-iri http://openenergy-platform.org/ontology/oeo/ --output $@
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.1
+2.1.0
diff --git a/src/ontology/edits/catalog-v001.xml b/src/ontology/edits/catalog-v001.xml
@@ -5,14 +5,11 @@
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-sector.omn" uri="oeo-sector.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-social.omn" uri="oeo-social.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-shared.omn" uri="oeo-shared.omn"/>
-    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-annotation-module.owl" uri="../imports/iao-annotation-module.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-extracted.owl" uri="../imports/iao-extracted.owl"/>
-    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-minimal-module.owl" uri="../imports/iao-minimal-module.owl"/>
-    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/omo-extracted.owl" uri="../imports/omo-extracted.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl" uri="../imports/ro-extracted.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/uo-extracted.owl" uri="../imports/uo-extracted.owl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
-        <uri id="Automatically generated entry, Timestamp=1698136049067" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
-        <uri id="Automatically generated entry, Timestamp=1698136049067" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1701427820472" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1701427820472" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
     </group>
 </catalog>
diff --git a/src/ontology/edits/oeo-import-edits.owl b/src/ontology/edits/oeo-import-edits.owl
@@ -7,8 +7,10 @@
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:xml="http://www.w3.org/XML/1998/namespace"
      xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+     xmlns:prov="http://www.w3.org/ns/prov#"
      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-     xmlns:terms="http://purl.org/dc/terms/">
+     xmlns:terms="http://purl.org/dc/terms/"
+     xmlns:oboInOwl="http://www.geneontology.org/formats/oboInOwl#">
     <owl:Ontology rdf:about="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl">
         <owl:versionIRI rdf:resource="http://openenergy-platform.org/ontology/oeo/dev/oeo-import-edits.owl"/>
         <dc:description>Open Energy Ontology (imports-edit module)</dc:description>
@@ -35,12 +37,24 @@ Currently, it covers the `ro-extracted.owl`-file which is a subset of the Relati
 
 
 
+    <!-- http://purl.obolibrary.org/obo/IAO_0000116 -->
+
+    <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000116"/>
+
+
+
     <!-- http://purl.obolibrary.org/obo/IAO_0000118 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000118"/>
 
 
 
+    <!-- http://purl.obolibrary.org/obo/IAO_0000119 -->
+
+    <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000119"/>
+
+
+
     <!-- http://purl.obolibrary.org/obo/IAO_0000233 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000233"/>
@@ -70,35 +84,42 @@ Currently, it covers the `ro-extracted.owl`-file which is a subset of the Relati
 
 
 
-    <!-- http://openenergy-platform.org/ontology/oeo/OEO_00010121 -->
+    <!-- http://purl.obolibrary.org/obo/BFO_0000050 -->
 
-    <owl:ObjectProperty rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00010121"/>
+    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/BFO_0000050">
+        <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/>
+    </owl:ObjectProperty>
 
 
 
-    <!-- http://openenergy-platform.org/ontology/oeo/OEO_00020188 -->
-
-    <owl:ObjectProperty rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00020188"/>
-
-
+    <!-- http://purl.obolibrary.org/obo/BFO_0000051 -->
 
-    <!-- http://openenergy-platform.org/ontology/oeo/OEO_00140002 -->
+    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/BFO_0000051">
+        <obo:IAO_0000233>issue https://github.com/OpenEnergyPlatform/ontology/issues/596
+Pull request https://github.com/OpenEnergyPlatform/ontology/pull/599
+Pull request https://github.com/OpenEnergyPlatform/ontology/pull/603
 
-    <owl:ObjectProperty rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00140002"/>
+fix duplicate implementation of `Inverse Of`
+issue https://github.com/OpenEnergyPlatform/ontology/issues/979
+pull request https://github.com/OpenEnergyPlatform/ontology/pull/1086</obo:IAO_0000233>
+    </owl:ObjectProperty>
 
 
 
-    <!-- http://purl.obolibrary.org/obo/BFO_0000050 -->
+    <!-- http://purl.obolibrary.org/obo/IAO_0000136 -->
 
-    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/BFO_0000050">
-        <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/>
+    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000136">
+        <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
     </owl:ObjectProperty>
 
 
 
-    <!-- http://purl.obolibrary.org/obo/BFO_0000051 -->
+    <!-- http://purl.obolibrary.org/obo/IAO_0000581 -->
 
-    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/BFO_0000051"/>
+    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000581">
+        <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000582"/>
+        <obo:IAO_0000116>IAO declared &quot;time measurement datum&quot; as range, which is (not yet) imported by OEO. Therefore the range declaration is missing here.</obo:IAO_0000116>
+    </owl:ObjectProperty>
 
 
 
@@ -261,36 +282,6 @@ pull request https://github.com/OpenEnergyPlatform/ontology/pull/1086</obo:IAO_0
 
 
 
-    <!-- http://openenergy-platform.org/ontology/oeo/OEO_00000150 -->
-
-    <owl:Class rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00000150"/>
-
-
-
-    <!-- http://openenergy-platform.org/ontology/oeo/OEO_00010412 -->
-
-    <owl:Class rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00010412"/>
-
-
-
-    <!-- http://openenergy-platform.org/ontology/oeo/OEO_00020143 -->
-
-    <owl:Class rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00020143"/>
-
-
-
-    <!-- http://openenergy-platform.org/ontology/oeo/OEO_00020186 -->
-
-    <owl:Class rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00020186"/>
-
-
-
-    <!-- http://openenergy-platform.org/ontology/oeo/OEO_00020187 -->
-
-    <owl:Class rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00020187"/>
-
-
-
     <!-- http://purl.obolibrary.org/obo/BFO_0000002 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000002"/>
@@ -305,30 +296,13 @@ pull request https://github.com/OpenEnergyPlatform/ontology/pull/1086</obo:IAO_0
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000009 -->
 
-    <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000009">
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://openenergy-platform.org/ontology/oeo/OEO_00140002"/>
-                <owl:someValuesFrom rdf:resource="http://openenergy-platform.org/ontology/oeo/OEO_00020143"/>
-            </owl:Restriction>
-        </rdfs:subClassOf>
-    </owl:Class>
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000009"/>
 
 
 
     <!-- http://purl.obolibrary.org/obo/BFO_0000016 -->
 
-    <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000016">
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://openenergy-platform.org/ontology/oeo/OEO_00010121"/>
-                <owl:someValuesFrom rdf:resource="http://purl.obolibrary.org/obo/BFO_0000004"/>
-            </owl:Restriction>
-        </rdfs:subClassOf>
-        <obo:IAO_0000233>add bearer axiom to oeo-import-edits
-issue: https://github.com/OpenEnergyPlatform/ontology/issues/1305
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1485</obo:IAO_0000233>
-    </owl:Class>
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000016"/>
 
 
 
@@ -341,19 +315,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1485</obo:IAO_
     <!-- http://purl.obolibrary.org/obo/BFO_0000020 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000020">
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://openenergy-platform.org/ontology/oeo/OEO_00010121"/>
-                <owl:someValuesFrom>
-                    <owl:Class>
-                        <owl:unionOf rdf:parseType="Collection">
-                            <rdf:Description rdf:about="http://openenergy-platform.org/ontology/oeo/OEO_00000150"/>
-                            <rdf:Description rdf:about="http://purl.obolibrary.org/obo/BFO_0000004"/>
-                        </owl:unionOf>
-                    </owl:Class>
-                </owl:someValuesFrom>
-            </owl:Restriction>
-        </rdfs:subClassOf>
         <obo:IAO_0000233>add bearer axiom to oeo-import-edits
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1305
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1485</obo:IAO_0000233>
@@ -376,14 +337,37 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1485</obo:IAO_
     <!-- http://purl.obolibrary.org/obo/IAO_0000010 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/IAO_0000010">
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://openenergy-platform.org/ontology/oeo/OEO_00020188"/>
-                <owl:someValuesFrom rdf:resource="http://openenergy-platform.org/ontology/oeo/OEO_00020187"/>
-            </owl:Restriction>
-        </rdfs:subClassOf>
         <obo:IAO_0000233>Add &apos;has licence&apos; axiom:
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1275
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1547
+move axiom to oeo-model
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1738</obo:IAO_0000233>
+    </owl:Class>
+
+
+
+    <!-- http://purl.obolibrary.org/obo/IAO_0000013 -->
+
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/IAO_0000013">
+        <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/IAO_0000088"/>
+        <obo:IAO_0000233>add subclass axiom to report
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1700
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1754</obo:IAO_0000233>
+        <rdfs:comment>IAO provides two parent classes, from which only &quot;report&quot; in imported to OEO.</rdfs:comment>
+    </owl:Class>
+
+
+
+    <!-- http://purl.obolibrary.org/obo/IAO_0000030 -->
+
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/IAO_0000030">
+        <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000031"/>
+        <obo:IAO_0000233>add axiom has copyright license
+issue https://github.com/OpenEnergyPlatform/ontology/issues/1061
+pull request https://github.com/OpenEnergyPlatform/ontology/pull/1090
+
+Delete axiom has (copyright) licence:
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1275
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1547</obo:IAO_0000233>
     </owl:Class>
 
@@ -431,6 +415,12 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652</obo:IAO_
 
 
 
+    <!-- http://purl.obolibrary.org/obo/IAO_0000582 -->
+
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/IAO_0000582"/>
+
+
+
     <!-- http://purl.obolibrary.org/obo/UO_0000000 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/UO_0000000">
@@ -465,6 +455,17 @@ https://github.com/OpenEnergyPlatform/ontology/pull/1741</obo:IAO_0000233>
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
+    <rdf:Description rdf:about="http://purl.obolibrary.org/obo/IAO_0000027">
+        <obo:IAO_0000115>A data item is an information content entity that is intended to be a truthful statement about something (modulo, e.g., measurement precision or other systematic errors) and is constructed/acquired by a method which reliably tends to produce (approximately) truthful statements.</obo:IAO_0000115>
+        <obo:IAO_0000119>http://www.ontobee.org/ontology/IAO?iri=http://purl.obolibrary.org/obo/IAO_0000027</obo:IAO_0000119>
+    </rdf:Description>
+    <owl:Axiom>
+        <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/IAO_0000027"/>
+        <owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
+        <owl:annotatedTarget>A data item is an information content entity that is intended to be a truthful statement about something (modulo, e.g., measurement precision or other systematic errors) and is constructed/acquired by a method which reliably tends to produce (approximately) truthful statements.</owl:annotatedTarget>
+        <obo:IAO_0000233>issue: https://github.com/OpenEnergyPlatform/ontology/issues/823
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/826</obo:IAO_0000233>
+    </owl:Axiom>
     <rdf:Description rdf:about="http://purl.obolibrary.org/obo/RO_0002418">
         <obo:IAO_0000233>add subset of relation below &apos;causally related to&apos;
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1079