Merge pull request #1742 from OpenEnergyPlatform/releases-v2.0.1

Releases v2.0.1 to dev
OpenEnergyPlatform · Oct 26, 2023 · 26679e0 · 26679e0
2 parents 0802f8e + 181aaaf
commit 26679e0
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,10 @@ 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.X.X] - 20XX-XX-XX
+## [2.0.1] - 2023-10-26
 
-### Added
 ### Changed
-### Removed
+- unit, prefix, generically dependent continuant (#1741/#1742)
 
 ## [2.0.0] - 2023-10-25
 

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.0
+version: 2.0.1
 doi:
-date-released: 2023-10-25
+date-released: 2023-10-26
 url: "https://github.com/OpenEnergyPlatform/ontology"
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/src/ontology/edits/oeo-import-edits.owl b/src/ontology/edits/oeo-import-edits.owl
@@ -29,6 +29,18 @@ Currently, it covers the `ro-extracted.owl`-file which is a subset of the Relati
 
 
 
+    <!-- http://purl.obolibrary.org/obo/IAO_0000115 -->
+
+    <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000115"/>
+
+
+
+    <!-- http://purl.obolibrary.org/obo/IAO_0000118 -->
+
+    <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000118"/>
+
+
+
     <!-- http://purl.obolibrary.org/obo/IAO_0000233 -->
 
     <owl:AnnotationProperty rdf:about="http://purl.obolibrary.org/obo/IAO_0000233"/>
@@ -349,6 +361,18 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1485</obo:IAO_
 
 
 
+    <!-- http://purl.obolibrary.org/obo/BFO_0000031 -->
+
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000031"/>
+
+
+
+    <!-- http://purl.obolibrary.org/obo/BFO_0000141 -->
+
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000141"/>
+
+
+
     <!-- http://purl.obolibrary.org/obo/IAO_0000010 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/IAO_0000010">
@@ -407,6 +431,32 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652</obo:IAO_
 
 
 
+    <!-- http://purl.obolibrary.org/obo/UO_0000000 -->
+
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/UO_0000000">
+        <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000031"/>
+        <obo:IAO_0000115>A unit of measurement is a standardised quantity of a quantifiable entity</obo:IAO_0000115>
+        <obo:IAO_0000118 xml:lang="en">unit of measurement</obo:IAO_0000118>
+        <obo:IAO_0000233>issue: https://github.com/OpenEnergyPlatform/ontology/issues/533
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/537
+renaming
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/895
+
+Remove unintended duplicated SubClassOf axiom and restore OEO definition:
+https://github.com/OpenEnergyPlatform/ontology/pull/1741</obo:IAO_0000233>
+        <rdfs:comment>The original definition from UO is &quot;A unit of measurement is a standardized quantity of a physical quality.&quot;. It was adjusted for OEO purposes such that currencies can also be defined as units.</rdfs:comment>
+    </owl:Class>
+
+
+
+    <!-- http://purl.obolibrary.org/obo/UO_0000046 -->
+
+    <owl:Class rdf:about="http://purl.obolibrary.org/obo/UO_0000046">
+        <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000141"/>
+    </owl:Class>
+
+
+
     <!-- 
     ///////////////////////////////////////////////////////////////////////////////////////
     //

diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn
@@ -1083,16 +1083,6 @@ Class: <http://purl.obolibrary.org/obo/RO_0002577>
 
 Class: <http://purl.obolibrary.org/obo/UO_0000000>
 
-    Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/533
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/537
-renaming
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/895",
-        rdfs:comment "The original definition from UO is \"A unit of measurement is a standardized quantity of a physical quality.\". It was adjusted for OEO purposes such that currencies can also be defined as units."
-
-    SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000031>
-
 
 Class: <http://purl.obolibrary.org/obo/UO_0000001>
 
@@ -1108,9 +1098,6 @@ Class: <http://purl.obolibrary.org/obo/UO_0000036>
 
 Class: <http://purl.obolibrary.org/obo/UO_0000046>
 
-    SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000141>
-
 
 Class: <http://purl.obolibrary.org/obo/UO_0000047>
 
@@ -1174,7 +1161,7 @@ Class: OEO_00000064
 
     SubClassOf: 
         OEO_00000051
-
+    
 
 Class: OEO_00000107
 

diff --git a/src/ontology/imports/omo-extracted.owl b/src/ontology/imports/omo-extracted.owl
@@ -805,7 +805,6 @@ We also have the outstanding issue of how to aim different definitions to differ
     <!-- http://purl.obolibrary.org/obo/BFO_0000031 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000031">
-        <rdfs:subClassOf rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/omo.owl"/>
     </owl:Class>
     <owl:Axiom>
@@ -814,12 +813,6 @@ We also have the outstanding issue of how to aim different definitions to differ
         <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/omo/releases/2023-08-23/omo.owl"/>
     </owl:Axiom>
-    <owl:Axiom>
-        <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/BFO_0000031"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
-        <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
-        <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/omo/releases/2023-08-23/omo.owl"/>
-    </owl:Axiom>
 
 
 
@@ -893,7 +886,13 @@ We also have the outstanding issue of how to aim different definitions to differ
 
 
 
-    <!-- http://www.w3.org/2002/07/owl#Thing -->
+    <!-- 
+    ///////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Annotations
+    //
+    ///////////////////////////////////////////////////////////////////////////////////////
+     -->
 
     <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#Thing">
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/omo.owl"/>
@@ -902,5 +901,5 @@ We also have the outstanding issue of how to aim different definitions to differ
 
 
 
-<!-- Generated by the OWL API (version 4.5.25) https://github.com/owlcs/owlapi -->
+<!-- Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi -->
 
diff --git a/src/ontology/imports/uo-extracted.owl b/src/ontology/imports/uo-extracted.owl
@@ -124,8 +124,6 @@
     <!-- http://purl.obolibrary.org/obo/UO_0000000 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/UO_0000000">
-        <rdfs:subClassOf rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
-        <obo:IAO_0000115>&quot;A unit of measurement is a standardized quantity of a physical quality.&quot; [Wikipedia:Wikipedia]</obo:IAO_0000115>
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/uo.owl"/>
         <rdfs:label>unit</rdfs:label>
     </owl:Class>
@@ -135,18 +133,6 @@
         <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
-    <owl:Axiom>
-        <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
-        <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
-        <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
-    </owl:Axiom>
-    <owl:Axiom>
-        <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
-        <owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
-        <owl:annotatedTarget>&quot;A unit of measurement is a standardized quantity of a physical quality.&quot; [Wikipedia:Wikipedia]</owl:annotatedTarget>
-        <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
-    </owl:Axiom>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
         <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
@@ -166,26 +152,26 @@
     </owl:Class>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000001"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
-        <owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
+        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
+        <owl:annotatedTarget>length unit</owl:annotatedTarget>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000001"/>
-        <owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
-        <owl:annotatedTarget>&quot;A unit which is a standard measure of the distance between two points.&quot; [Wikipedia:Wikipedia]</owl:annotatedTarget>
+        <owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
+        <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000001"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
-        <owl:annotatedTarget>length unit</owl:annotatedTarget>
+        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
+        <owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_0000000"/>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000001"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
-        <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+        <owl:annotatedProperty rdf:resource="http://purl.obolibrary.org/obo/IAO_0000115"/>
+        <owl:annotatedTarget>&quot;A unit which is a standard measure of the distance between two points.&quot; [Wikipedia:Wikipedia]</owl:annotatedTarget>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
 
@@ -383,7 +369,6 @@
     <!-- http://purl.obolibrary.org/obo/UO_0000046 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/UO_0000046">
-        <rdfs:subClassOf rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/uo.owl"/>
         <rdfs:label>prefix</rdfs:label>
     </owl:Class>
@@ -393,12 +378,6 @@
         <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
-    <owl:Axiom>
-        <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000046"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
-        <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
-        <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
-    </owl:Axiom>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_0000046"/>
         <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
@@ -940,12 +919,6 @@
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/uo.owl"/>
         <rdfs:label>year based unit</rdfs:label>
     </owl:Class>
-    <owl:Axiom>
-        <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_1000036"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
-        <owl:annotatedTarget>year based unit</owl:annotatedTarget>
-        <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
-    </owl:Axiom>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_1000036"/>
         <owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
@@ -958,6 +931,12 @@
         <owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_0000003"/>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
+    <owl:Axiom>
+        <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_1000036"/>
+        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
+        <owl:annotatedTarget>year based unit</owl:annotatedTarget>
+        <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
+    </owl:Axiom>
 
 
 
@@ -970,26 +949,32 @@
     </owl:Class>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_1000223"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
-        <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
+        <owl:annotatedTarget>watt-hour based unit</owl:annotatedTarget>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_1000223"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
-        <owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_0000111"/>
+        <owl:annotatedProperty rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
+        <owl:annotatedTarget rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
     <owl:Axiom>
         <owl:annotatedSource rdf:resource="http://purl.obolibrary.org/obo/UO_1000223"/>
-        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#label"/>
-        <owl:annotatedTarget>watt-hour based unit</owl:annotatedTarget>
+        <owl:annotatedProperty rdf:resource="http://www.w3.org/2000/01/rdf-schema#subClassOf"/>
+        <owl:annotatedTarget rdf:resource="http://purl.obolibrary.org/obo/UO_0000111"/>
         <prov:wasDerivedFrom rdf:resource="http://purl.obolibrary.org/obo/uo/releases/2023-05-25/uo.owl"/>
     </owl:Axiom>
 
 
 
-    <!-- http://www.w3.org/2002/07/owl#Thing -->
+    <!-- 
+    ///////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Annotations
+    //
+    ///////////////////////////////////////////////////////////////////////////////////////
+     -->
 
     <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#Thing">
         <rdfs:isDefinedBy rdf:resource="http://purl.obolibrary.org/obo/uo.owl"/>
@@ -998,5 +983,5 @@
 
 
 
-<!-- Generated by the OWL API (version 4.5.25) https://github.com/owlcs/owlapi -->
+<!-- Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi -->