Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Releases v2.0.1 to master #1741

Merged
merged 8 commits into from
Oct 26, 2023
Merged

Releases v2.0.1 to master #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52edc58
Merge pull request #1736 from OpenEnergyPlatform/releases-v2.0.0
l-emele Oct 25, 2023
97ef700
Update CHANGELOG.md
l-emele Oct 25, 2023
0802f8e
Merge pull request #1739 from OpenEnergyPlatform/new-unrelease-section
l-emele Oct 25, 2023
b819e40
Fix `unit` and `prefix`
l-emele Oct 26, 2023
e53b306
Fix generically dependent continuant
l-emele Oct 26, 2023
172cc12
Fix unit
l-emele Oct 26, 2023
aefa258
Update version, release date and changelog
l-emele Oct 26, 2023
181aaaf
Update term tracker
l-emele Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ 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.0.1] - 2023-10-26

### Changed
- unit, prefix, generically dependent continuant (#1741/#1742)

## [2.0.0] - 2023-10-25

### Major stuctural changes
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.0.1
50 changes: 50 additions & 0 deletions src/ontology/edits/oeo-import-edits.owl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>



<!--
///////////////////////////////////////////////////////////////////////////////////////
//
Expand Down
15 changes: 1 addition & 14 deletions src/ontology/edits/oeo-shared.omn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -1174,7 +1161,7 @@ Class: OEO_00000064

SubClassOf:
OEO_00000051


Class: OEO_00000107

Expand Down
17 changes: 8 additions & 9 deletions src/ontology/imports/omo-extracted.owl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>



Expand Down Expand Up @@ -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"/>
Expand All @@ -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 -->

71 changes: 28 additions & 43 deletions src/ontology/imports/uo-extracted.owl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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"/>
Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand All @@ -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>



Expand All @@ -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"/>
Expand All @@ -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 -->

Loading