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

OpenEnergyPlatform · May 14, 2024 · c6a4bfa · c6a4bfa
2 parents 5e9800d + caede7d
commit c6a4bfa
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,10 +13,15 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - quantity (#1839)
 - model coupling, sector coupling, sector coupling technology (#1842)
 - emission value, greenhouse gas emission value, CO2 emission value, emission factor value (#1846)
+- size (#1851)
+- (de)commissioning start, (de)commissioning end (#1853)
 
 ### Changed
 - has documentation quality (#1834)
 - emission factor, emission rate, greenhouse gas emission rate, CO2 emission rate, carbon dioxide equivalent quantity value (#1846)
+- area value (#1851)
+- time stamp (#1853)
+- has bearer, has characteristic, characteristic of, role of, model role (#1852)
 
 ### Removed
 

diff --git a/src/ontology/edits/oeo-import-edits.owl b/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">

diff --git a/src/ontology/edits/oeo-model.omn b/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>
 
 
@@ -2572,6 +2578,56 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1842",
         OEO_00000275
 
 
+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: 
@@ -2856,7 +2912,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
 
@@ -2866,11 +2922,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

diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn
@@ -9460,15 +9460,21 @@ Class: OEO_00020143
         <http://purl.obolibrary.org/obo/IAO_0000118> "area quantity value",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/889
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/933
+
 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
+
+restructuring of quantity values
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1848
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1851",
         rdfs:label "area value"@en
 
     SubClassOf: 
         OEO_00000350,
-        OEO_00020056 some <http://purl.obolibrary.org/obo/BFO_0000009>,
-        OEO_00040010 some <http://purl.obolibrary.org/obo/UO_0000047>
+        OEO_00020056 some OEO_00340068,
+        OEO_00040010 some <http://purl.obolibrary.org/obo/UO_0000047>,
+        <http://purl.obolibrary.org/obo/IAO_0000136> some <http://purl.obolibrary.org/obo/BFO_0000009>
 
 
 Class: OEO_00020144
@@ -14506,6 +14512,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1486",
         OEO_00020056 some OEO_00000159
 
 
+Class: OEO_00340062
+
+
 Class: OEO_00340063
 
     Annotations: 
@@ -14564,6 +14573,20 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1846",
         OEO_00020056 some OEO_00260008
 
 
+Class: OEO_00340068
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Size is a quantity that quantifies the spatial extend/physical magnitude of an entity.",
+        <http://purl.obolibrary.org/obo/IAO_0000119> "Derived from: http://purl.allotrope.org/ontologies/result#AFR_0002109 and http://purl.obolibrary.org/obo/PATO_0000117",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "restructuring of quantity values
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1848
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1851",
+        rdfs:label "size"@en
+
+    SubClassOf: 
+        OEO_00340062
+
+
 Class: OEO_00360001
 
     Annotations: 

diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn
@@ -139,25 +139,19 @@ ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000053>
     Annotations: 
         <http://purl.obolibrary.org/obo/IAO_0000118> "has characteristic"
 
-    Domain: 
-
-            Annotations: <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/973
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/985"
-        OEO_00000150 or <http://purl.obolibrary.org/obo/BFO_0000004>
-
     Range: 
         <http://purl.obolibrary.org/obo/BFO_0000020>
 
-    InverseOf: 
-        OEO_00010121
-
 
 ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000056>
 
 
 ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000057>
 
 
+ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000081>
+
+
 ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000085>
 
 
@@ -172,9 +166,6 @@ ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000087>
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1030
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1101"
 
-    Domain: 
-        OEO_00000150 or <http://purl.obolibrary.org/obo/BFO_0000004>
-
 
 ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000091>
 
@@ -616,7 +607,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/985
 
 correct definition with respect to energy:
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1305
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1484",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1484
+
+remove inverse:
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1844
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1852",
         rdfs:label "has bearer"@en
 
     Domain: 
@@ -625,9 +620,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1484",
     Range: 
         OEO_00000150 or <http://purl.obolibrary.org/obo/BFO_0000004>
 
-    InverseOf: 
-        <http://purl.obolibrary.org/obo/RO_0000053>
-
 
 ObjectProperty: OEO_00010231
 
@@ -1209,10 +1201,6 @@ Class: <http://purl.obolibrary.org/obo/BFO_0000019>
 
 Class: <http://purl.obolibrary.org/obo/BFO_0000020>
 
-    SubClassOf: 
-        OEO_00010121 some 
-            (OEO_00000150 or <http://purl.obolibrary.org/obo/BFO_0000004>)
-
 
 Class: <http://purl.obolibrary.org/obo/BFO_0000023>
 
@@ -1725,11 +1713,16 @@ Class: OEO_00020353
     Annotations: 
         <http://purl.obolibrary.org/obo/IAO_0000115> "A model role is a a role of a continuant for representing a system and its behaviours in a simplified or idealised way.",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707
+
+add axiom:
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1844
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1852",
         rdfs:label "model role"@en
 
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000023>
+        <http://purl.obolibrary.org/obo/BFO_0000023>,
+        <http://purl.obolibrary.org/obo/RO_0000081> some OEO_00020352
 
 
 Class: OEO_00030019