From 4fb49a426e3d12bc4535ed34c26df894b2246aa8 Mon Sep 17 00:00:00 2001 From: ColinHDev Date: Fri, 6 Dec 2024 10:21:19 +0100 Subject: [PATCH 1/5] Change version number --- CHANGELOG.md | 2 +- CITATION.cff | 4 ++-- VERSION | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d52ecbdad..6f774d150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.y] - 202x-xx-xx +## [2.6.0] - 2024-12-06 ### Added - has aggregation type, has time stamp alignment (#1944) - study descriptor (#1950) diff --git a/CITATION.cff b/CITATION.cff index 08bd523c9..e7a890bdc 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -166,6 +166,6 @@ authors: title: "Open Energy Ontology (OEO)" type: software license: CC0-1.0 -version: 2.5.0 -date-released: 2024-09-24 +version: 2.6.0 +date-released: 2024-12-06 url: "https://github.com/OpenEnergyPlatform/ontology" diff --git a/VERSION b/VERSION index 437459cd9..e70b4523a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.0 +2.6.0 From cd5149dc6963046aaef8bd7198fd517f603fd456 Mon Sep 17 00:00:00 2001 From: ColinHDev Date: Fri, 6 Dec 2024 10:35:22 +0100 Subject: [PATCH 2/5] Fix missing subclass of 'generically dependent continuant' --- src/ontology/edits/oeo-model.omn | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index daa5ef622..db9156e03 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -3811,16 +3811,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1945", -Class: OEO_00400042 - - Annotations: - "A technical model implementation is a generically dependent continuant that is part of a model and consists of the hardware and software realization of a (conceptual) model.", - "model code", - "https://www.researchgate.net/publication/264816512_Classifying_and_communicating_uncertainties_in_model-based_policy_analysis", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1953 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1978", - rdfs:label "technical model implementation"@en - Class: OEO_00400041 Annotations: @@ -3829,13 +3819,26 @@ Class: OEO_00400041 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1951 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1977", rdfs:label "model system boundary"@en - SubClassOf: , some OEO_00000274 +Class: OEO_00400042 + + Annotations: + "A technical model implementation is a generically dependent continuant that is part of a model and consists of the hardware and software realization of a (conceptual) model.", + "model code", + "https://www.researchgate.net/publication/264816512_Classifying_and_communicating_uncertainties_in_model-based_policy_analysis", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1953 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1978", + rdfs:label "technical model implementation"@en + + SubClassOf: + + + Individual: OEO_00000049 Annotations: From 96afcd8365f7985778932d64a5196bab8fdbef6b Mon Sep 17 00:00:00 2001 From: ColinHDev Date: Fri, 6 Dec 2024 10:38:53 +0100 Subject: [PATCH 3/5] Fix typo --- src/ontology/edits/oeo-physical.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn index b44374e50..00b7808ce 100644 --- a/src/ontology/edits/oeo-physical.omn +++ b/src/ontology/edits/oeo-physical.omn @@ -6252,7 +6252,7 @@ Class: OEO_00010138 Annotations: OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/863 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/911", - "Carbon capture is a process that captures carbon dioxide from a gas. test", + "Carbon capture is a process that captures carbon dioxide from a gas.", "CO2-Abscheidung"@de, rdfs:label "carbon capture"@en From e6913d65ff0a01a934602818f447aab291d2f0a3 Mon Sep 17 00:00:00 2001 From: madbkr Date: Fri, 6 Dec 2024 10:41:50 +0100 Subject: [PATCH 4/5] Removed obsolete axiom --- src/ontology/edits/oeo-tasks.omn | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ontology/edits/oeo-tasks.omn b/src/ontology/edits/oeo-tasks.omn index 3f5ba25b5..cd154ca02 100644 --- a/src/ontology/edits/oeo-tasks.omn +++ b/src/ontology/edits/oeo-tasks.omn @@ -712,8 +712,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1940", SubClassOf: OEO_00020166, - ( some OEO_00390059) - and ( some OEO_00390060), some OEO_00390061 From 1b0687ff5a1e0a808c1e1d71098efb60e837fa5d Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:33:48 +0100 Subject: [PATCH 5/5] Update CHANGELOG.md Co-authored-by: madbkr <92733183+madbkr@users.noreply.github.com> --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f774d150..c82ad4987 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ - supply grid, transport network, critical infrastructure (#1947) - areal solar energy density (#1983) -### Removed ## [2.5.0] - 2024-09-24