From ff2ba271a93b4f62e3747be49fa9c930f0602496 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Tue, 12 Dec 2023 09:12:34 +0100 Subject: [PATCH 01/14] Add axioms to sector classes and individuals #1333 --- CHANGELOG.md | 1 + src/ontology/edits/oeo-shared-axioms.omn | 161 +++++++++++++++++++++++ 2 files changed, 162 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d016e530c..2e7f544b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ - B7, E10 (#1774) - data descriptor (#1775) - target description, policy instrument, policy (#1778) +- electricity sector, industry sector, CRF sector (IPCC 2006) individuals (###) ## [2.0.1] - 2023-10-26 diff --git a/src/ontology/edits/oeo-shared-axioms.omn b/src/ontology/edits/oeo-shared-axioms.omn index 8bb1d7e56..bca42bda7 100644 --- a/src/ontology/edits/oeo-shared-axioms.omn +++ b/src/ontology/edits/oeo-shared-axioms.omn @@ -389,6 +389,9 @@ Class: Class: OEO_00000001 +Class: OEO_00000006 + + Class: OEO_00000020 @@ -407,6 +410,9 @@ Class: OEO_00000061 Class: OEO_00000064 +Class: OEO_00000072 + + Class: OEO_00000087 @@ -422,6 +428,12 @@ Class: OEO_00000139 Class: OEO_00000143 +Class: OEO_00000145 + + SubClassOf: + OEO_00010312 some OEO_00240014 + + Class: OEO_00000147 @@ -434,6 +446,12 @@ Class: OEO_00000199 Class: OEO_00000206 +Class: OEO_00000227 + + SubClassOf: + OEO_00010312 some OEO_00050000 + + Class: OEO_00000264 SubClassOf: @@ -516,6 +534,12 @@ Class: OEO_00010130 OEO_00000501 value OEO_00010129 +Class: OEO_00010138 + + +Class: OEO_00010140 + + Class: OEO_00010255 SubClassOf: @@ -528,6 +552,15 @@ Class: OEO_00010268 OEO_00020179 some OEO_00140081 +Class: OEO_00010280 + + +Class: OEO_00010285 + + +Class: OEO_00010292 + + Class: OEO_00010296 SubClassOf: @@ -753,9 +786,15 @@ Class: OEO_00050018 Class: OEO_00090001 +Class: OEO_00140003 + + Class: OEO_00140004 +Class: OEO_00140038 + + Class: OEO_00140039 @@ -825,12 +864,18 @@ Class: OEO_00240029 some OEO_00040011 +Class: OEO_00240030 + + Class: OEO_00240031 SubClassOf: some OEO_00040011 +Class: OEO_00240032 + + Class: OEO_00240034 SubClassOf: @@ -852,6 +897,42 @@ Class: OEO_00320021 OEO_00020180 some OEO_00040009 +Individual: OEO_00010042 + + Types: + (not (OEO_00010312 some OEO_00140004)) + and (OEO_00010312 some OEO_00140003) + + +Individual: OEO_00010043 + + Types: + OEO_00010312 some OEO_00140038 + + +Individual: OEO_00010046 + + Types: + OEO_00010312 some OEO_00050000 + + +Individual: OEO_00010058 + + Types: + OEO_00010312 some + (OEO_00010140 + and (OEO_00140003 + and ( some OEO_00000006))) + + +Individual: OEO_00010061 + + Types: + OEO_00010312 some + (OEO_00140003 + and ( some OEO_00010280)) + + Individual: OEO_00010122 Facts: @@ -876,6 +957,86 @@ Individual: OEO_00010132 Individual: OEO_00010133 +Individual: OEO_00010164 + + Types: + OEO_00010312 some + (OEO_00240003 + and (OEO_00000533 some OEO_00240030)) + + +Individual: OEO_00010165 + + Types: + OEO_00010312 some + (OEO_00240003 + and (OEO_00000533 some OEO_00240029)) + + +Individual: OEO_00010166 + + Types: + OEO_00010312 some + (OEO_00240003 + and (OEO_00000533 some OEO_00240027)) + + +Individual: OEO_00010167 + + Types: + OEO_00010312 some + (OEO_00240003 + and (OEO_00000533 some OEO_00240032)) + + +Individual: OEO_00010168 + + Types: + OEO_00010312 some + (OEO_00240003 + and (OEO_00000533 some OEO_00240034)) + + +Individual: OEO_00010200 + + Types: + OEO_00010312 some + (OEO_00010285 or (OEO_00140004 + and ( some OEO_00010292))) + + +Individual: OEO_00010201 + + Types: + OEO_00010312 some + (OEO_00140004 + and ( some OEO_00010292)) + + +Individual: OEO_00010202 + + Types: + OEO_00010312 some + (OEO_00140004 + and ( some OEO_00010285)) + + Individual: OEO_00010205 +Individual: OEO_00010228 + + Types: + OEO_00010312 some + (OEO_00260007 + and ( some + (OEO_00140038 + and (OEO_00000532 some OEO_00000072)))) + + +Individual: OEO_00010229 + + Types: + OEO_00010312 some OEO_00010138 + + From adb9a70232546a45bd91f4463d3c2473f83dfb0a Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Tue, 12 Dec 2023 09:16:28 +0100 Subject: [PATCH 02/14] Update term tracker items #1333 --- src/ontology/edits/oeo-sector.omn | 104 ++++++++++++++++++++++++------ 1 file changed, 86 insertions(+), 18 deletions(-) diff --git a/src/ontology/edits/oeo-sector.omn b/src/ontology/edits/oeo-sector.omn index 34bc6233b..8d4f97c04 100644 --- a/src/ontology/edits/oeo-sector.omn +++ b/src/ontology/edits/oeo-sector.omn @@ -332,7 +332,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/484 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "electricity sector"@en SubClassOf: @@ -400,7 +404,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/484 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "industry sector"@en SubClassOf: @@ -1019,7 +1027,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/523 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): transport"@en Types: @@ -1045,7 +1057,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/523 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): fuel combustion - other sectors"@en Types: @@ -1098,7 +1114,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/941 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): industrial processes and product use"@en Types: @@ -1374,7 +1394,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/595 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): CO2 transport and storage"@en Types: @@ -1442,14 +1466,18 @@ Individual: OEO_00010061 Annotations: OEO_00010037 "CRF 1.A.3.c", "2006 IPCC Guidelines for National Greenhouse Gas Inventories, Volume 1, Chapter 8.5, https://www.ipcc-nggip.iges.or.jp/public/2006gl/", - "The CRF sector (IPCC 2006) 'railways' is a transport sector defined by the 2006 IPCC Guidelines for National Greenhouse Gas Inventories: -Emissions from railway transport for both freight and passenger traffic routes.", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/580 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/595 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", + "The CRF sector (IPCC 2006) 'railways' is a transport sector defined by the 2006 IPCC Guidelines for National Greenhouse Gas Inventories: +Emissions from railway transport for both freight and passenger traffic routes. + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): railways"@en Types: @@ -1991,7 +2019,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/941 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): mineral industry"@en Types: @@ -2014,7 +2046,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/941 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): cement production"@en Types: @@ -2037,7 +2073,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/941 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): chemical industry"@en Types: @@ -2060,7 +2100,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/941 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): metal industry"@en Types: @@ -2087,7 +2131,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1440 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): iron and steel production"@en Types: @@ -2820,7 +2868,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1334 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): international bunkers"@en Types: @@ -2851,7 +2903,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1334 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): international aviation"@en Types: @@ -2884,7 +2940,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1334 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): maritime navigation"@en Types: @@ -3081,7 +3141,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/967 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): CO2 emissions from biomass"@en Types: @@ -3102,7 +3166,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/967 move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724 + +Add 'is sector of' axiom: +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "CRF sector (IPCC 2006): CO2 captured"@en Types: From b29c7c362e9dfa58488bf58c1a78add54c68d90e Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Mon, 18 Dec 2023 14:44:24 +0100 Subject: [PATCH 03/14] Add subsector functionallity #1333 Add class: `subsector` Add object property: `has proper part`, `proper part of`, `has subsector`, `subsector of` Adapt some axioms to test --- src/ontology/edits/oeo-sector.omn | 67 ++++++++++++++++++++++++++----- src/ontology/edits/oeo-shared.omn | 32 +++++++++++++++ 2 files changed, 89 insertions(+), 10 deletions(-) diff --git a/src/ontology/edits/oeo-sector.omn b/src/ontology/edits/oeo-sector.omn index 8d4f97c04..88d435fa4 100644 --- a/src/ontology/edits/oeo-sector.omn +++ b/src/ontology/edits/oeo-sector.omn @@ -168,6 +168,39 @@ ObjectProperty: OEO_00010312 OEO_00000367 +ObjectProperty: OEO_00010465 + + +ObjectProperty: OEO_00010466 + + Annotations: + rdfs:label "subsector of"@en + + SubPropertyOf: + OEO_00010465 + + Domain: + OEO_00010464 + + Range: + OEO_00000367 + + +ObjectProperty: OEO_00010467 + + Annotations: + rdfs:label "has subsector"@en + + SubPropertyOf: + + + Domain: + OEO_00000367 + + Range: + OEO_00010464 + + ObjectProperty: OEO_00020056 @@ -757,6 +790,20 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", OEO_00000368 +Class: OEO_00010464 + + Annotations: + "A subsector is a sector that is a proper part of an other sector."@en, + rdfs:label "subsector"@en + + EquivalentTo: + OEO_00000367 + and (OEO_00010465 some OEO_00000367) + + SubClassOf: + OEO_00000367 + + Class: OEO_00020015 @@ -1466,18 +1513,18 @@ Individual: OEO_00010061 Annotations: OEO_00010037 "CRF 1.A.3.c", "2006 IPCC Guidelines for National Greenhouse Gas Inventories, Volume 1, Chapter 8.5, https://www.ipcc-nggip.iges.or.jp/public/2006gl/", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/580 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/595 - -move to oeo-sector -issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", "The CRF sector (IPCC 2006) 'railways' is a transport sector defined by the 2006 IPCC Guidelines for National Greenhouse Gas Inventories: Emissions from railway transport for both freight and passenger traffic routes. Add 'is sector of' axiom: issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/580 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/595 + +move to oeo-sector +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", rdfs:label "CRF sector (IPCC 2006): railways"@en Types: @@ -1585,9 +1632,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", Facts: OEO_00000504 OEO_00010056, - OEO_00010040, - OEO_00010057, - OEO_00010064 + OEO_00010467 OEO_00010040, + OEO_00010467 OEO_00010057, + OEO_00010467 OEO_00010064 Individual: OEO_00010066 @@ -1880,7 +1927,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", Facts: OEO_00000504 OEO_00000242, - OEO_00010040 + OEO_00010466 OEO_00010040 Individual: OEO_00010159 diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index e23cd17ea..aced6b193 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -654,6 +654,38 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1321", or +ObjectProperty: OEO_00010463 + + Annotations: + rdfs:label "has proper part"@en + + SubPropertyOf: + + + Characteristics: + Irreflexive, + Asymmetric + + InverseOf: + OEO_00010465 + + +ObjectProperty: OEO_00010465 + + Annotations: + rdfs:label "proper part of"@en + + SubPropertyOf: + + + Characteristics: + Irreflexive, + Asymmetric + + InverseOf: + OEO_00010463 + + ObjectProperty: OEO_00020056 Annotations: From 0c8c5a638c26aec02d99b240c44ee1d2931845fd Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Thu, 11 Jan 2024 08:49:07 +0100 Subject: [PATCH 04/14] Fix hierarchy of `has subsector` #1333 --- src/ontology/edits/oeo-sector.omn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-sector.omn b/src/ontology/edits/oeo-sector.omn index 88d435fa4..8cdd5f287 100644 --- a/src/ontology/edits/oeo-sector.omn +++ b/src/ontology/edits/oeo-sector.omn @@ -168,6 +168,9 @@ ObjectProperty: OEO_00010312 OEO_00000367 +ObjectProperty: OEO_00010463 + + ObjectProperty: OEO_00010465 @@ -192,7 +195,7 @@ ObjectProperty: OEO_00010467 rdfs:label "has subsector"@en SubPropertyOf: - + OEO_00010463 Domain: OEO_00000367 From ba187538ddd861c22acc33e19da86b4b29cd959c Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Thu, 11 Jan 2024 16:48:21 +0100 Subject: [PATCH 05/14] Fix axiom --- src/ontology/edits/oeo-shared-axioms.omn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-shared-axioms.omn b/src/ontology/edits/oeo-shared-axioms.omn index bca42bda7..cc185eae1 100644 --- a/src/ontology/edits/oeo-shared-axioms.omn +++ b/src/ontology/edits/oeo-shared-axioms.omn @@ -1001,8 +1001,8 @@ Individual: OEO_00010200 Types: OEO_00010312 some - (OEO_00010285 or (OEO_00140004 - and ( some OEO_00010292))) + (OEO_00140004 + and (OEO_00010285 or ( some OEO_00010292))) Individual: OEO_00010201 From 88cd0eb962459f7a7088620a39dd1bcea1d29939 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 2 Feb 2024 12:35:53 +0100 Subject: [PATCH 06/14] Add definition to `has proper part` and update CHANGELOG.md --- CHANGELOG.md | 3 ++- src/ontology/edits/oeo-shared.omn | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68046ebd9..d70b3f584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,14 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ ### Added - economic instrument, voluntary agreement, voluntary agreement instrument, regulatory instrument, information instrument, education instrument (#1786) +- has proper part (1788) - priority region role, priority region, conditionally reserved region role, conditionally reserved region, suitable region role, suitable region, priority region with effect of suitable region, spatial planning policy (#1791) - missing value reason, notation key (#1795) ### Changed - energy transfer function, energy transformation function and subclasses (#1785) - effort sharing, feed-in tariff, levy, market premium (#1786) +- electricity sector, industry sector, CRF sector (IPCC 2006) individuals (1788) - policy instrument (#1791) - region of relevance (#1791) - MMR sector division, EU emission sector division (#1797) @@ -43,7 +45,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ - B7, E10 (#1774) - data descriptor (#1775) - target description, policy instrument, policy (#1778) -- electricity sector, industry sector, CRF sector (IPCC 2006) individuals (###) ## [2.0.1] - 2023-10-26 diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index aced6b193..397cfa231 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -657,6 +657,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1321", ObjectProperty: OEO_00010463 Annotations: + "A has part relation that denotes an antisymmetric, irreflexive (normally transitive) relation between a whole and a distinct part."@en, rdfs:label "has proper part"@en SubPropertyOf: From 48b5805ecf95c7c551930030ac754844e00eb14e Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 2 Feb 2024 12:59:36 +0100 Subject: [PATCH 07/14] Add term tracker items #1333 --- src/ontology/edits/oeo-shared.omn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 397cfa231..7a495d75d 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -658,6 +658,8 @@ ObjectProperty: OEO_00010463 Annotations: "A has part relation that denotes an antisymmetric, irreflexive (normally transitive) relation between a whole and a distinct part."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "has proper part"@en SubPropertyOf: @@ -674,6 +676,8 @@ ObjectProperty: OEO_00010463 ObjectProperty: OEO_00010465 Annotations: + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "proper part of"@en SubPropertyOf: From 728d095aa3708b664e03ec2baeef209fdad4e99f Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Mon, 11 Mar 2024 15:33:09 +0100 Subject: [PATCH 08/14] Add new unreleased section in CHANGELOG.md and move entries #1788 --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c004f42d8..0e70ffd11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,20 @@ 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 +- has proper part (1788) + +### Changed +- electricity sector, industry sector, CRF sector (IPCC 2006) individuals (1788) + +### Removed + ## [2.2.0] - 2024-03-04 ### Added - economic instrument, voluntary agreement, voluntary agreement instrument, regulatory instrument, information instrument, education instrument (#1786) -- has proper part (1788) - priority region role, priority region, conditionally reserved region role, conditionally reserved region, suitable region role, suitable region, priority region with effect of suitable region, spatial planning policy (#1791) - missing value reason, notation key (#1795) - non-energy use technology (#1803) @@ -20,7 +29,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ ### Changed - energy transfer function, energy transformation function and subclasses (#1785) - effort sharing, feed-in tariff, levy, market premium (#1786) -- electricity sector, industry sector, CRF sector (IPCC 2006) individuals (1788) - policy instrument (#1791) - region of relevance (#1791) - MMR sector division, EU emission sector division (#1797) From ee9fd8f5b14fd57349c33b3e35f98adb80da989c Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Mon, 11 Mar 2024 15:36:10 +0100 Subject: [PATCH 09/14] Update CHANGELOG.md #1788 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e70ffd11..d58b83c12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ ## [2.X.X] - 20XX-XX-XX ### Added -- has proper part (1788) +- has proper part, proper part of, subsector, has subsector, subsector of (1788) ### Changed - electricity sector, industry sector, CRF sector (IPCC 2006) individuals (1788) From b615d49eb60d5eee54a263c1cc4a9756c9796b96 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 31 May 2024 09:02:28 +0200 Subject: [PATCH 10/14] Remove `has proper part` and `proper part of` #1333 Follow-up changes: * class `subsector` cannot be a equivalent class anymore * `has subsector` and `subsector of` become direct subproperties of `has part` resp. `part of` --- CHANGELOG.md | 2 +- src/ontology/edits/oeo-sector.omn | 14 ++---------- src/ontology/edits/oeo-shared.omn | 37 ------------------------------- 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index beb095ec3..cca422da7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ ## [2.X.X] - 20XX-XX-XX ### Added -- has proper part, proper part of, subsector, has subsector, subsector of (#1788) +- subsector, has subsector, subsector of (#1788) - methanol (#1827) - has prefix (#1835) - imported 'characteristic of' and subclasses from RO (#1838) diff --git a/src/ontology/edits/oeo-sector.omn b/src/ontology/edits/oeo-sector.omn index ae265dbaf..b089bc252 100644 --- a/src/ontology/edits/oeo-sector.omn +++ b/src/ontology/edits/oeo-sector.omn @@ -171,19 +171,13 @@ ObjectProperty: OEO_00010312 OEO_00000367 -ObjectProperty: OEO_00010463 - - -ObjectProperty: OEO_00010465 - - ObjectProperty: OEO_00010466 Annotations: rdfs:label "subsector of"@en SubPropertyOf: - OEO_00010465 + Domain: OEO_00010464 @@ -198,7 +192,7 @@ ObjectProperty: OEO_00010467 rdfs:label "has subsector"@en SubPropertyOf: - OEO_00010463 + Domain: OEO_00000367 @@ -807,10 +801,6 @@ Class: OEO_00010464 "A subsector is a sector that is a proper part of an other sector."@en, rdfs:label "subsector"@en - EquivalentTo: - OEO_00000367 - and (OEO_00010465 some OEO_00000367) - SubClassOf: OEO_00000367 diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 270a819b1..00df52f85 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -649,43 +649,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1321", or -ObjectProperty: OEO_00010463 - - Annotations: - "A has part relation that denotes an antisymmetric, irreflexive (normally transitive) relation between a whole and a distinct part."@en, - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", - rdfs:label "has proper part"@en - - SubPropertyOf: - - - Characteristics: - Irreflexive, - Asymmetric - - InverseOf: - OEO_00010465 - - -ObjectProperty: OEO_00010465 - - Annotations: - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", - rdfs:label "proper part of"@en - - SubPropertyOf: - - - Characteristics: - Irreflexive, - Asymmetric - - InverseOf: - OEO_00010463 - - ObjectProperty: OEO_00010472 Annotations: From 7ac678c11cded2837a9dbfafbc561d2751b78c86 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 31 May 2024 09:23:25 +0200 Subject: [PATCH 11/14] Add/improve definitions and add term tracker items #1333 --- src/ontology/edits/oeo-sector.omn | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-sector.omn b/src/ontology/edits/oeo-sector.omn index b089bc252..67b583020 100644 --- a/src/ontology/edits/oeo-sector.omn +++ b/src/ontology/edits/oeo-sector.omn @@ -174,6 +174,9 @@ ObjectProperty: OEO_00010312 ObjectProperty: OEO_00010466 Annotations: + "A part of relation between a sector and its parent sector."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "subsector of"@en SubPropertyOf: @@ -185,10 +188,16 @@ ObjectProperty: OEO_00010466 Range: OEO_00000367 + InverseOf: + OEO_00010467 + ObjectProperty: OEO_00010467 Annotations: + "A has part relation between a sector and its subsector."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "has subsector"@en SubPropertyOf: @@ -200,6 +209,9 @@ ObjectProperty: OEO_00010467 Range: OEO_00010464 + InverseOf: + OEO_00010466 + ObjectProperty: OEO_00020056 @@ -798,9 +810,15 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", Class: OEO_00010464 Annotations: - "A subsector is a sector that is a proper part of an other sector."@en, + "A subsector is a sector that is a part of an other sector."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1333 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1788", rdfs:label "subsector"@en + EquivalentTo: + OEO_00000367 + and (OEO_00010466 some OEO_00000367) + SubClassOf: OEO_00000367 From 4d860319127aadbe853caa848a93081763432bac Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 31 May 2024 09:25:14 +0200 Subject: [PATCH 12/14] Add German label to class `subsector` #1333 --- src/ontology/oeo.omn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ontology/oeo.omn b/src/ontology/oeo.omn index 7dc5c10f4..a36195f92 100644 --- a/src/ontology/oeo.omn +++ b/src/ontology/oeo.omn @@ -65,6 +65,9 @@ A supplementary module is the oeo-physical-axioms module, which contains general dct:license , dct:title "Open Energy Ontology" +AnnotationProperty: + + AnnotationProperty: dc:contributor From 1b96e96a6435a3db5c007a2757702cb876c0d039 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 31 May 2024 09:27:25 +0200 Subject: [PATCH 13/14] Fix changelog #1333 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73ccb19be..3c0a48b3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,15 +6,16 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ ## [2.X.X] - 20XX-XX-XX ### Added +- subsector, has subsector, subsector of (#1788) ### Changed +- electricity sector, industry sector, CRF sector (IPCC 2006) individuals (#1788) ### Removed ## [2.3.0] - 2024-05-21 ### Added -- subsector, has subsector, subsector of (#1788) - methanol (#1827) - has prefix (#1835) - imported 'characteristic of' and subclasses from RO (#1838) @@ -27,7 +28,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ - German alternative labels to about 40 classes (#1854) ### Changed -- electricity sector, industry sector, CRF sector (IPCC 2006) individuals (#1788) - has documentation quality (#1834) - megawatt-hour, gigawatt-hour, terawatt-hour, petawatt-hour (#1845) - energy consumption value, final energy consumption value, primary energy consumption value, gross inland energy consumption value, gross national electricity consumption value (#1841) From 6535c0c3b8c6a1a9e5d4ce1d2856fa4ab792108e Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 31 May 2024 09:29:08 +0200 Subject: [PATCH 14/14] Clean oeo.omn #1333 --- src/ontology/oeo.omn | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ontology/oeo.omn b/src/ontology/oeo.omn index a36195f92..7dc5c10f4 100644 --- a/src/ontology/oeo.omn +++ b/src/ontology/oeo.omn @@ -65,9 +65,6 @@ A supplementary module is the oeo-physical-axioms module, which contains general dct:license , dct:title "Open Energy Ontology" -AnnotationProperty: - - AnnotationProperty: dc:contributor