From 97ef700c0c1db833e32daa4c1efec72869bc595c Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Wed, 25 Oct 2023 11:59:07 +0200 Subject: [PATCH 1/6] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 801ec4eab..df0185b6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ 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 + +### Added +### Changed +### Removed + ## [2.0.0] - 2023-10-25 ### Major stuctural changes From b819e402373f4f8768a317062011d98b4ee38716 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Thu, 26 Oct 2023 09:04:40 +0200 Subject: [PATCH 2/6] Fix `unit` and `prefix` --- src/ontology/edits/oeo-import-edits.owl | 33 ++++++++++++++ src/ontology/edits/oeo-shared.omn | 15 +------ src/ontology/imports/uo-extracted.owl | 60 +++++++++++-------------- 3 files changed, 60 insertions(+), 48 deletions(-) diff --git a/src/ontology/edits/oeo-import-edits.owl b/src/ontology/edits/oeo-import-edits.owl index f441e64ef..c6f8334f6 100644 --- a/src/ontology/edits/oeo-import-edits.owl +++ b/src/ontology/edits/oeo-import-edits.owl @@ -349,6 +349,18 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1485 + + + + + + + + + + + @@ -407,6 +419,27 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652 + + + + 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 + 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. + + + + + + + + + + + + - "A unit of measurement is a standardized quantity of a physical quality." [Wikipedia:Wikipedia] unit @@ -135,12 +134,6 @@ - - - - - - @@ -164,12 +157,6 @@ length unit - - - - - - @@ -188,6 +175,12 @@ + + + + + + @@ -383,7 +376,6 @@ - prefix @@ -393,12 +385,6 @@ - - - - - - @@ -940,12 +926,6 @@ year based unit - - - - year based unit - - @@ -958,6 +938,12 @@ + + + + year based unit + + @@ -968,12 +954,6 @@ watt-hour based unit - - - - - - @@ -986,10 +966,22 @@ watt-hour based unit + + + + + + - + @@ -998,5 +990,5 @@ - + From e53b3062ddcf6648b54c7c1eb57883a5793a2b19 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Thu, 26 Oct 2023 09:24:41 +0200 Subject: [PATCH 3/6] Fix generically dependent continuant --- src/ontology/imports/omo-extracted.owl | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/ontology/imports/omo-extracted.owl b/src/ontology/imports/omo-extracted.owl index 57dfa60a6..341776b4e 100644 --- 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 - @@ -814,12 +813,6 @@ We also have the outstanding issue of how to aim different definitions to differ - - - - - - @@ -893,7 +886,13 @@ We also have the outstanding issue of how to aim different definitions to differ - + @@ -902,5 +901,5 @@ We also have the outstanding issue of how to aim different definitions to differ - + From 172cc125bcef4eeeba5bc41c27e583239d382a01 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Thu, 26 Oct 2023 09:31:38 +0200 Subject: [PATCH 4/6] Fix unit --- src/ontology/edits/oeo-import-edits.owl | 19 ++++++++++++++- src/ontology/imports/uo-extracted.owl | 31 ++++++++++--------------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/ontology/edits/oeo-import-edits.owl b/src/ontology/edits/oeo-import-edits.owl index c6f8334f6..56d687ad1 100644 --- 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 + + + + + + + + + + + + @@ -423,10 +435,15 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652 + A unit of measurement is a standardised quantity of a quantifiable entity + unit of measurement 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 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/895 + +Fix unit: +https://github.com/OpenEnergyPlatform/ontology/pull/1741 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. diff --git a/src/ontology/imports/uo-extracted.owl b/src/ontology/imports/uo-extracted.owl index 517900565..82d0c8cf4 100644 --- a/src/ontology/imports/uo-extracted.owl +++ b/src/ontology/imports/uo-extracted.owl @@ -124,7 +124,6 @@ - "A unit of measurement is a standardized quantity of a physical quality." [Wikipedia:Wikipedia] unit @@ -134,12 +133,6 @@ - - - - "A unit of measurement is a standardized quantity of a physical quality." [Wikipedia:Wikipedia] - - @@ -157,12 +150,6 @@ length unit - - - - "A unit which is a standard measure of the distance between two points." [Wikipedia:Wikipedia] - - @@ -181,6 +168,12 @@ + + + + "A unit which is a standard measure of the distance between two points." [Wikipedia:Wikipedia] + + @@ -954,12 +947,6 @@ watt-hour based unit - - - - - - @@ -972,6 +959,12 @@ + + + + + + From aefa2583462c5651f267a315b915b9545fc1c91e Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Thu, 26 Oct 2023 09:37:38 +0200 Subject: [PATCH 5/6] Update version, release date and changelog --- CHANGELOG.md | 5 ++--- CITATION.cff | 4 ++-- VERSION | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df0185b6d..3e3f6612f 100644 --- 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 index dc1362eeb..6a02372b5 100644 --- 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 index 227cea215..38f77a65b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.0.1 From 181aaaf06630cd0ff067f9125747602eec106c55 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Thu, 26 Oct 2023 09:42:30 +0200 Subject: [PATCH 6/6] Update term tracker --- src/ontology/edits/oeo-import-edits.owl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-import-edits.owl b/src/ontology/edits/oeo-import-edits.owl index 56d687ad1..d8517b8f3 100644 --- a/src/ontology/edits/oeo-import-edits.owl +++ b/src/ontology/edits/oeo-import-edits.owl @@ -442,7 +442,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/537 renaming pull request: https://github.com/OpenEnergyPlatform/ontology/pull/895 -Fix unit: +Remove unintended duplicated SubClassOf axiom and restore OEO definition: https://github.com/OpenEnergyPlatform/ontology/pull/1741 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.