From f229d47ea4c91b339e752ba0090344bef696b81f Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 23 Feb 2024 11:37:59 +0100 Subject: [PATCH 1/9] Add object property `has unit numerator` and subproperties #1815 --- src/ontology/edits/oeo-shared.omn | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index e23cd17ea..64e9a7d10 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -654,6 +654,58 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1321", or +ObjectProperty: OEO_00010472 + + Annotations: + "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A."@en, + rdfs:label "has unit numerator"@en + + SubPropertyOf: + + + Domain: + + + Range: + + + +ObjectProperty: OEO_00010473 + + Annotations: + "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 1."@en, + rdfs:label "has linear unit numerator"@en + + SubPropertyOf: + OEO_00010472 + + Domain: + + + Range: + + + +ObjectProperty: OEO_00010474 + + Annotations: + "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 2."@en, + rdfs:label "has squared unit numerator"@en + + SubPropertyOf: + OEO_00010472 + + +ObjectProperty: OEO_00010475 + + Annotations: + "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 3."@en, + rdfs:label "has cubed unit numerator"@en + + SubPropertyOf: + OEO_00010472 + + ObjectProperty: OEO_00020056 Annotations: From 9ff8660fcc44178674f1c91db0a3c55e7cf87d10 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 23 Feb 2024 11:42:03 +0100 Subject: [PATCH 2/9] Add object property `has unit denominator` and subproperties #1815 --- src/ontology/edits/oeo-shared.omn | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 64e9a7d10..5bd3c1cd3 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -706,6 +706,46 @@ ObjectProperty: OEO_00010475 OEO_00010472 +ObjectProperty: OEO_00010476 + + Annotations: + "A relation between a (composed) unit A and a unit B in which B is in the denominator of unit A."@en, + rdfs:label "has unit denominator"@en + + SubPropertyOf: + + + +ObjectProperty: OEO_00010477 + + Annotations: + "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 1."@en, + rdfs:label "has linear unit denominator"@en + + SubPropertyOf: + OEO_00010476 + + +ObjectProperty: OEO_00010478 + + Annotations: + "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 2."@en, + rdfs:label "has squared unit denominator"@en + + SubPropertyOf: + OEO_00010476 + + +ObjectProperty: OEO_00010479 + + Annotations: + "A relation between a (composed) unit A and a unit B in which B is in the denominator of unit A with exponent 3."@en, + rdfs:label "has cubed unit denominator"@en + + SubPropertyOf: + OEO_00010476 + + ObjectProperty: OEO_00020056 Annotations: From d0616105f76b6df0a7e6afb01ee4f3d6f892a416 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 23 Feb 2024 11:47:20 +0100 Subject: [PATCH 3/9] Add term tracker items and update CHANGELOG.md #1815 --- CHANGELOG.md | 1 + src/ontology/edits/oeo-shared.omn | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b03b5643..876fea26d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ - economic instrument, voluntary agreement, voluntary agreement instrument, regulatory instrument, information instrument, education instrument (#1786) - 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) +- has unit numerator, hasunit denominator and subproperties (#1816) ### Changed - energy transfer function, energy transformation function and subclasses (#1785) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 5bd3c1cd3..de46e871c 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -674,6 +674,8 @@ ObjectProperty: OEO_00010473 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 1."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", rdfs:label "has linear unit numerator"@en SubPropertyOf: @@ -690,6 +692,8 @@ ObjectProperty: OEO_00010474 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 2."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", rdfs:label "has squared unit numerator"@en SubPropertyOf: @@ -700,6 +704,8 @@ ObjectProperty: OEO_00010475 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 3."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", rdfs:label "has cubed unit numerator"@en SubPropertyOf: @@ -710,6 +716,8 @@ ObjectProperty: OEO_00010476 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the denominator of unit A."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", rdfs:label "has unit denominator"@en SubPropertyOf: @@ -720,6 +728,8 @@ ObjectProperty: OEO_00010477 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 1."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", rdfs:label "has linear unit denominator"@en SubPropertyOf: @@ -730,6 +740,8 @@ ObjectProperty: OEO_00010478 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 2."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", rdfs:label "has squared unit denominator"@en SubPropertyOf: @@ -740,6 +752,8 @@ ObjectProperty: OEO_00010479 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the denominator of unit A with exponent 3."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", rdfs:label "has cubed unit denominator"@en SubPropertyOf: From 1ed40e6bb0a2ce8333dc3e42f53ef199541de9df Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 23 Feb 2024 11:59:08 +0100 Subject: [PATCH 4/9] Add domains, ranges and disjoints #1815 --- src/ontology/edits/oeo-shared.omn | 84 +++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index de46e871c..e3800d0c1 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -663,6 +663,9 @@ ObjectProperty: OEO_00010472 SubPropertyOf: + DisjointWith: + OEO_00010476 + Domain: @@ -681,6 +684,13 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", SubPropertyOf: OEO_00010472 + DisjointWith: + OEO_00010474, + OEO_00010475, + OEO_00010477, + OEO_00010478, + OEO_00010479 + Domain: @@ -699,6 +709,19 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", SubPropertyOf: OEO_00010472 + DisjointWith: + OEO_00010473, + OEO_00010475, + OEO_00010477, + OEO_00010478, + OEO_00010479 + + Domain: + + + Range: + + ObjectProperty: OEO_00010475 @@ -711,6 +734,19 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", SubPropertyOf: OEO_00010472 + DisjointWith: + OEO_00010473, + OEO_00010474, + OEO_00010477, + OEO_00010478, + OEO_00010479 + + Domain: + + + Range: + + ObjectProperty: OEO_00010476 @@ -723,6 +759,15 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", SubPropertyOf: + DisjointWith: + OEO_00010472 + + Domain: + + + Range: + + ObjectProperty: OEO_00010477 @@ -735,6 +780,19 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", SubPropertyOf: OEO_00010476 + DisjointWith: + OEO_00010473, + OEO_00010474, + OEO_00010475, + OEO_00010478, + OEO_00010479 + + Domain: + + + Range: + + ObjectProperty: OEO_00010478 @@ -747,6 +805,19 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", SubPropertyOf: OEO_00010476 + DisjointWith: + OEO_00010473, + OEO_00010474, + OEO_00010475, + OEO_00010477, + OEO_00010479 + + Domain: + + + Range: + + ObjectProperty: OEO_00010479 @@ -759,6 +830,19 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", SubPropertyOf: OEO_00010476 + DisjointWith: + OEO_00010473, + OEO_00010474, + OEO_00010475, + OEO_00010477, + OEO_00010478 + + Domain: + + + Range: + + ObjectProperty: OEO_00020056 From 5e521f8b5bce0919ac29201711829b44aa4b3750 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 23 Feb 2024 12:08:33 +0100 Subject: [PATCH 5/9] Add elucidation #1815 --- src/ontology/edits/oeo-shared.omn | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index e3800d0c1..bf618cec0 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -42,6 +42,9 @@ AnnotationProperty: AnnotationProperty: +AnnotationProperty: + + AnnotationProperty: @@ -658,6 +661,10 @@ ObjectProperty: OEO_00010472 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A."@en, + "A composed unit has is composed of at least two other units. Examples are: +m/s has a linear numerator metre and a linear denominator second. +kg/m³ has a linear numerator kilogram and a cubed denominator metre. +Wh has two linear numerators: Watt and hour", rdfs:label "has unit numerator"@en SubPropertyOf: @@ -754,6 +761,10 @@ ObjectProperty: OEO_00010476 "A relation between a (composed) unit A and a unit B in which B is in the denominator of unit A."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", + "A composed unit has is composed of at least two other units. Examples are: +m/s has a linear numerator metre and a linear denominator second. +kg/m³ has a linear numerator kilogram and a cubed denominator metre. +Wh has two linear numerators: Watt and hour", rdfs:label "has unit denominator"@en SubPropertyOf: From 6bfd5bcd144c28a05aabbd6acdda6351d81d3dd9 Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Fri, 23 Feb 2024 12:11:41 +0100 Subject: [PATCH 6/9] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 876fea26d..377a8a4c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ - economic instrument, voluntary agreement, voluntary agreement instrument, regulatory instrument, information instrument, education instrument (#1786) - 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) -- has unit numerator, hasunit denominator and subproperties (#1816) +- has unit numerator, has unit denominator and subproperties (#1816) ### Changed - energy transfer function, energy transformation function and subclasses (#1785) From a8d45652ad7b0eb2227b4a79621cf3718abbd9f1 Mon Sep 17 00:00:00 2001 From: l-emele <36884905+l-emele@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:30:10 +0100 Subject: [PATCH 7/9] Update src/ontology/edits/oeo-shared.omn Co-authored-by: stap-m <38690039+stap-m@users.noreply.github.com> --- src/ontology/edits/oeo-shared.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index bf618cec0..2d0677792 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -661,7 +661,7 @@ ObjectProperty: OEO_00010472 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A."@en, - "A composed unit has is composed of at least two other units. Examples are: + "A composed unit is composed of at least two other units. Examples are: m/s has a linear numerator metre and a linear denominator second. kg/m³ has a linear numerator kilogram and a cubed denominator metre. Wh has two linear numerators: Watt and hour", From 7eab829c7e4134c4d5a06bb840ec532f59a23413 Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 23 Feb 2024 15:30:41 +0100 Subject: [PATCH 8/9] Add missing term tracker item #1815 --- src/ontology/edits/oeo-shared.omn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index bf618cec0..1a2c941a8 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -661,6 +661,8 @@ ObjectProperty: OEO_00010472 Annotations: "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A."@en, + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", "A composed unit has is composed of at least two other units. Examples are: m/s has a linear numerator metre and a linear denominator second. kg/m³ has a linear numerator kilogram and a cubed denominator metre. From 9276812578af8ab7d0bdfe3216009068c6a7a69a Mon Sep 17 00:00:00 2001 From: Lukas Emele Date: Fri, 23 Feb 2024 15:36:52 +0100 Subject: [PATCH 9/9] Add elucidation to subproperties, too #1815 --- src/ontology/edits/oeo-shared.omn | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 4dd3bf965..b07363cab 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -688,6 +688,10 @@ ObjectProperty: OEO_00010473 "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 1."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", + "A composed unit is composed of at least two other units. Examples are: +m/s has a linear numerator metre and a linear denominator second. +kg/m³ has a linear numerator kilogram and a cubed denominator metre. +Wh has two linear numerators: Watt and hour", rdfs:label "has linear unit numerator"@en SubPropertyOf: @@ -713,6 +717,10 @@ ObjectProperty: OEO_00010474 "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 2."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", + "A composed unit is composed of at least two other units. Examples are: +m/s has a linear numerator metre and a linear denominator second. +kg/m³ has a linear numerator kilogram and a cubed denominator metre. +Wh has two linear numerators: Watt and hour", rdfs:label "has squared unit numerator"@en SubPropertyOf: @@ -738,6 +746,10 @@ ObjectProperty: OEO_00010475 "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 3."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", + "A composed unit is composed of at least two other units. Examples are: +m/s has a linear numerator metre and a linear denominator second. +kg/m³ has a linear numerator kilogram and a cubed denominator metre. +Wh has two linear numerators: Watt and hour", rdfs:label "has cubed unit numerator"@en SubPropertyOf: @@ -763,7 +775,7 @@ ObjectProperty: OEO_00010476 "A relation between a (composed) unit A and a unit B in which B is in the denominator of unit A."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", - "A composed unit has is composed of at least two other units. Examples are: + "A composed unit is composed of at least two other units. Examples are: m/s has a linear numerator metre and a linear denominator second. kg/m³ has a linear numerator kilogram and a cubed denominator metre. Wh has two linear numerators: Watt and hour", @@ -788,6 +800,10 @@ ObjectProperty: OEO_00010477 "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 1."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", + "A composed unit is composed of at least two other units. Examples are: +m/s has a linear numerator metre and a linear denominator second. +kg/m³ has a linear numerator kilogram and a cubed denominator metre. +Wh has two linear numerators: Watt and hour", rdfs:label "has linear unit denominator"@en SubPropertyOf: @@ -813,6 +829,10 @@ ObjectProperty: OEO_00010478 "A relation between a (composed) unit A and a unit B in which B is in the numerator of unit A with exponent 2."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", + "A composed unit is composed of at least two other units. Examples are: +m/s has a linear numerator metre and a linear denominator second. +kg/m³ has a linear numerator kilogram and a cubed denominator metre. +Wh has two linear numerators: Watt and hour", rdfs:label "has squared unit denominator"@en SubPropertyOf: @@ -838,6 +858,10 @@ ObjectProperty: OEO_00010479 "A relation between a (composed) unit A and a unit B in which B is in the denominator of unit A with exponent 3."@en, "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1815 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1816", + "A composed unit is composed of at least two other units. Examples are: +m/s has a linear numerator metre and a linear denominator second. +kg/m³ has a linear numerator kilogram and a cubed denominator metre. +Wh has two linear numerators: Watt and hour", rdfs:label "has cubed unit denominator"@en SubPropertyOf: