Merge branch 'dev' into feature-1471-german-labels_2

CHANGELOG.md

@@ -5,19 +5,38 @@ The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.
 and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [2.X.X] - 20XX-XX-XX
+### Added
+- subsector, has subsector, subsector of (#1788)
+
+### Changed
+- electricity sector, industry sector, CRF sector (IPCC 2006) individuals (#1788)
+- German alternative labels (#1862, #1868)
+
+### Removed
+
+## [2.3.0] - 2024-05-21
 
 ### Added
 - methanol (#1827)
 - has prefix (#1835)
 - imported 'characteristic of' and subclasses from RO (#1838)
 - quantity (#1839)
 - model coupling, sector coupling, sector coupling technology (#1842)
+- system robustness, robust system scenario, statistically robust, statistically robust scenario (#1843)
 - emission value, greenhouse gas emission value, CO2 emission value, emission factor value (#1846)
-- German alternative labels (#1854, #1862, #1868)
+- size (#1851)
+- (de)commissioning start, (de)commissioning end (#1853)
+- German alternative labels to about 40 classes (#1854)
 
 ### Changed
 - has documentation quality (#1834)
+- megawatt-hour, gigawatt-hour, terawatt-hour, petawatt-hour (#1845)
+- energy consumption value, final energy consumption value, primary energy consumption value, gross inland energy consumption value, gross national electricity consumption value (#1841)
 - emission factor, emission rate, greenhouse gas emission rate, CO2 emission rate, carbon dioxide equivalent quantity value (#1846)
+- area value (#1851)
+- has bearer, has characteristic, characteristic of, role of, model role (#1852)
+- time stamp (#1853)
+- electricity import/export value (#1864)
 
 ### Removed
 
@@ -107,6 +126,10 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - new module oeo-sectors (#1724)
 - mobility technology, electric mobility technology (#1727)
 - energy storage object hierarchy, energy storage technology hierarchy (#1728)
+<<<<<<< HEAD
+=======
+- German alternative labels (#1854, #1862)
+>>>>>>> dev
 
 ### Changed
 - energy transformation (#1625)

CITATION.cff

@@ -154,7 +154,7 @@ authors:
 title: "Open Energy Ontology (OEO)"
 type: software
 license: CC0-1.0
-version: 2.2.0
+version: 2.3.0
 doi:
-date-released: 2024-03-04
+date-released: 2024-05-21
 url: "https://github.com/OpenEnergyPlatform/ontology"

VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

src/ontology/edits/catalog-v001.xml

@@ -9,7 +9,7 @@
     <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=1713353354510" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
-        <uri id="Automatically generated entry, Timestamp=1713353354510" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1714049102654" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1714049102654" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
     </group>
 </catalog>

src/ontology/edits/oeo-import-edits.owl

@@ -123,6 +123,27 @@ pull request https://github.com/OpenEnergyPlatform/ontology/pull/1086</obo:IAO_0
 
 
 
+    <!-- http://purl.obolibrary.org/obo/RO_0000052 -->
+
+    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0000052">
+        <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0000053"/>
+        <obo:IAO_0000233>add inverse:
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1844
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1852</obo:IAO_0000233>
+    </owl:ObjectProperty>
+
+
+
+    <!-- http://purl.obolibrary.org/obo/RO_0000053 -->
+
+    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0000053">
+        <obo:IAO_0000233>update inverse:
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1844
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1852</obo:IAO_0000233>
+    </owl:ObjectProperty>
+
+
+
     <!-- http://purl.obolibrary.org/obo/RO_0000056 -->
 
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0000056">
@@ -152,6 +173,19 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1225</obo:IAO_
 
 
 
+    <!-- http://purl.obolibrary.org/obo/RO_0000081 -->
+
+    <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0000081">
+        <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/RO_0000087"/>
+        <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
+        <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000002"/>
+        <obo:IAO_0000233>add domain and range:
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1844
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1852</obo:IAO_0000233>
+    </owl:ObjectProperty>
+
+
+
     <!-- http://purl.obolibrary.org/obo/RO_0000085 -->
 
     <owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/RO_0000085">

src/ontology/edits/oeo-model.omn

@@ -503,6 +503,9 @@ Class: <http://purl.obolibrary.org/obo/BFO_0000003>
 Class: <http://purl.obolibrary.org/obo/BFO_0000006>
 
 
+Class: <http://purl.obolibrary.org/obo/BFO_0000008>
+
+
 Class: <http://purl.obolibrary.org/obo/BFO_0000009>
 
 
@@ -578,6 +581,9 @@ Class: <http://purl.obolibrary.org/obo/IAO_0000300>
 Class: <http://purl.obolibrary.org/obo/IAO_0000310>
 
 
+Class: <http://purl.obolibrary.org/obo/IAO_0000582>
+
+
 Class: <http://purl.obolibrary.org/obo/RO_0002577>
 
 
@@ -1783,7 +1789,7 @@ Class: OEO_00020017
 
     Annotations: 
         <http://purl.obolibrary.org/obo/IAO_0000115> "A analytical approach is a model descriptor that contains information about the analysis strategy of a model.",
-        <http://purl.obolibrary.org/obo/IAO_0000118> "Analytischer Ansatz"@de,
+        <http://purl.obolibrary.org/obo/IAO_0000118> "analytischer Ansatz"@de,
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/82
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/577
 fix typo of label
@@ -2261,7 +2267,7 @@ Class: OEO_00020185
     Annotations: 
         <http://purl.obolibrary.org/obo/IAO_0000115> "A copyright licence is a licence that states the ownership and contractually sets the rights and obligations to use, copy, and distribute a creative work.",
         <http://purl.obolibrary.org/obo/IAO_0000118> "Urheberrechtslizenz"@de,
-        <http://purl.obolibrary.org/obo/IAO_0000118> "copyright license",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "copyright license"@en,
         <http://purl.obolibrary.org/obo/IAO_0000233> "add relation has copyright license
 issue https://github.com/OpenEnergyPlatform/ontology/issues/1061
 pull request https://github.com/OpenEnergyPlatform/ontology/pull/1090
@@ -2284,7 +2290,7 @@ Class: OEO_00020186
     Annotations: 
         <http://purl.obolibrary.org/obo/IAO_0000115> "A data licence is a licence that determines ownership, database protection, and permissions for data.",
         <http://purl.obolibrary.org/obo/IAO_0000118> "Datenlizenz"@de,
-        <http://purl.obolibrary.org/obo/IAO_0000118> "data license",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "data license"@en,
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue https://github.com/OpenEnergyPlatform/ontology/issues/1061
 pull request https://github.com/OpenEnergyPlatform/ontology/pull/1090
 
@@ -2591,6 +2597,99 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1842",
         OEO_00000275
 
 
+
+Class: OEO_00020411
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A robust system scenario is an explorative scenario that describes an energy system that is designed to evolve in a robust way.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1683
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1843",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "robust investment decision",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "robust transformation pathway",
+        rdfs:label "robust system scenario"
+
+    SubClassOf: 
+        OEO_00020248
+
+
+Class: OEO_00020412
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1683
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1843",
+        dc:description "A statistically robust scenario is a scenario that is the basis for statistically robust projection data.",
+        rdfs:label "statistically robust scenario"
+
+    EquivalentTo: 
+        OEO_00000364
+         and (<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00020413)
+
+    SubClassOf: 
+        OEO_00000364
+
+
+Class: OEO_00020413
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1683
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1843",
+        dc:description "Statistically robust is a role of a scenario that is realized in scenario projections, model calculations or sensitivity analyses resulting in output data that is not greatly influenced by uncertainties in assumptions about the distribution of sample errors with respect to a (couple of) specific parameter(s).",
+        rdfs:label "statistically robust"
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000023>
+
+
+Class: OEO_00020416
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A commissioning start is a start time that indicates the beginning of a commissioning time.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1536
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1853",
+        rdfs:label "commissioning start"
+
+    SubClassOf: 
+        OEO_00030031
+
+
+Class: OEO_00020417
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A decommissioning start is a start time that indicates the beginning of a decommissioning time.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1536
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1853",
+        rdfs:label "decommissioning start"
+
+    SubClassOf: 
+        OEO_00030031
+
+
+Class: OEO_00020420
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A decommissioning end is an end time that indicates the beginning of a decommissioning time.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "decommissioning date",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1536
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1853",
+        rdfs:label "decommissioning end"
+
+    SubClassOf: 
+        OEO_00030032
+
+
+Class: OEO_00020421
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A commissioning end is an end time that indicates the beginning of a commissioning time.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "commissioning date",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1536
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1853",
+        rdfs:label "commissioning end"
+
+    SubClassOf: 
+        OEO_00030032
+
+
 Class: OEO_00030007
 
     Annotations: 
@@ -2883,7 +2982,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/565",
 Class: OEO_00140043
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A time stamp is a zero-dimensional temporal region that is used to describe a time step.",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A time stamp is a data descriptor that is used to describe a zero-dimensional temporal region, or a data item that is related to a zero-dimensional temporal region, e.g. a time stamped measurement datum.",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/267
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/570
 
@@ -2893,11 +2992,17 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1390
 
 rework module structure 
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
+
+reclassify as data descriptor
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1536
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1853",
         rdfs:label "time stamp"@en
 
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000148>
+        OEO_00000119,
+        <http://purl.obolibrary.org/obo/IAO_0000136> some <http://purl.obolibrary.org/obo/BFO_0000008>,
+        <http://purl.obolibrary.org/obo/IAO_0000136> some <http://purl.obolibrary.org/obo/IAO_0000582>
 
 
 Class: OEO_00140044