From 276aa0414ee2ee3705e7fac513c495f6760d5ed1 Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 2 Oct 2023 10:18:16 +0200 Subject: [PATCH 01/21] relabel model to numerical computer model #1444 --- src/ontology/edits/oeo-model.omn | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index 7a689cc2e..a4ea843fd 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -962,6 +962,7 @@ Class: OEO_00000274 Annotations: OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", "A model is a generically dependent continuant that is used for computing an idealised reproduction of a system and its behaviours."@en, + "formally called \"model\"", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/180 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/349 @@ -973,8 +974,12 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1113 rework module structure issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", - rdfs:label "model" +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652 + +rename and reclassify +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", + rdfs:label "numerical computer model" SubClassOf: From 6442e0d11290bbc2e348351099ba3ed369bed201 Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 2 Oct 2023 10:27:34 +0200 Subject: [PATCH 02/21] add new class model and model role to oeo-shared #1444 --- src/ontology/edits/oeo-model.omn | 2 +- src/ontology/edits/oeo-shared.omn | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index a4ea843fd..f4009e586 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -961,7 +961,7 @@ Class: OEO_00000274 Annotations: OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", - "A model is a generically dependent continuant that is used for computing an idealised reproduction of a system and its behaviours."@en, + "A numerical computer model is a mathematical model that is calculated by a computer."@en, "formally called \"model\"", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/180 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/349 diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index f640e17cc..5275770a9 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -1698,6 +1698,26 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", +Class: OEO_00020352 + + Annotations: + "A model is a continuant to represent a system and its behaviours in a simplified or idealised way.", + rdfs:label "model" + + SubClassOf: + + + +Class: OEO_00020353 + + Annotations: + "A model role is a a role of a continuant for representing a system and its behaviours in a simplified or idealised way.", + rdfs:label "model role" + + SubClassOf: + + + Class: OEO_00030019 Annotations: From 0ad350e03256867f6c7e461e014ebf041f4aadca Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 2 Oct 2023 10:36:51 +0200 Subject: [PATCH 03/21] add new class scale model and mathematical model, add term tracker #1444 --- src/ontology/edits/oeo-model.omn | 33 ++++++++++++++++++++++++++++++- src/ontology/edits/oeo-shared.omn | 8 ++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index f4009e586..d675e521e 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -982,7 +982,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "numerical computer model" SubClassOf: - + OEO_00020354 Class: OEO_00000275 @@ -2489,6 +2489,37 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1648", OEO_00000364 +Class: OEO_00020352 + + +Class: OEO_00020353 + + +Class: OEO_00020354 + + Annotations: + "An mathematical model is a generically dependent continuant that represents a system and its behaviours mathematically.", + "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", + rdfs:label "mathematical model" + + SubClassOf: + , + some OEO_00020353 + + +Class: OEO_00020355 + + Annotations: + "A scale model is model comprising of a spatial pattern of components arranged in such a way for them to represent a system.", + "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", + rdfs:label "scale model" + + SubClassOf: + OEO_00020352 + + Class: OEO_00030007 Annotations: diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 5275770a9..d5ebb8ae4 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -1702,8 +1702,14 @@ Class: OEO_00020352 Annotations: "A model is a continuant to represent a system and its behaviours in a simplified or idealised way.", + "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "model" + EquivalentTo: + + and ( some OEO_00020353) + SubClassOf: @@ -1712,6 +1718,8 @@ Class: OEO_00020353 Annotations: "A model role is a a role of a continuant for representing a system and its behaviours in a simplified or idealised way.", + "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "model role" SubClassOf: From 68195467bdc96aeb60788ec51ce67ae04e565b6f Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 23 Oct 2023 10:12:10 +0200 Subject: [PATCH 04/21] make mathematical model an information content entity #1444 #1707 --- src/ontology/edits/oeo-model.omn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index d675e521e..2bd598579 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -2498,13 +2498,13 @@ Class: OEO_00020353 Class: OEO_00020354 Annotations: - "An mathematical model is a generically dependent continuant that represents a system and its behaviours mathematically.", + "An mathematical model is a information content artifact that represents a system and its behaviours mathematically.", "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "mathematical model" SubClassOf: - , + , some OEO_00020353 From cce5d1bb881c38b45868374b1427f1cf916347e6 Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 23 Oct 2023 10:16:11 +0200 Subject: [PATCH 05/21] change domain of models #1444 #1707 --- src/ontology/edits/oeo-shared.omn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index d5ebb8ae4..7c9323caa 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -1122,11 +1122,15 @@ ObjectProperty: OEO_00140164 Annotations: "A relation between a model and the thing it reproduces.", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/415 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/821", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/821 + +change domaim +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "models"@en Domain: - OEO_00000274 + OEO_00020352 Range: From 4d143b23be923b389fc629d7d5b28a2346ec5be5 Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 23 Oct 2023 10:17:54 +0200 Subject: [PATCH 06/21] change domain of has contributor #1444 #1707 --- 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 7c9323caa..5266f415a 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -1071,7 +1071,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain an rdfs:label "has contributor"@en Domain: - OEO_00000274 or + OEO_00020352 or Range: From 72b6ea5034a8aec957b3ff6941cd34a09920628d Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 23 Oct 2023 10:26:26 +0200 Subject: [PATCH 07/21] change domain of has contributor subclasses #1444 #1707 --- src/ontology/edits/oeo-shared.omn | 44 ++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 5266f415a..b0ff31969 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -483,17 +483,21 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/852", ObjectProperty: OEO_00000506 Annotations: - "A relation that holds between an information content entity / model and its author."@en, + "A relation that holds between an information content entity and its author."@en, "The construct 'has author' some ('has role' some author) is necessary, because 'has author' has the range 'has role some author' (PR https://github.com/OpenEnergyPlatform/ontology/pull/871). That is an independent continuant, i.e. a person, that takes over writing a text and as such the role of an author.", "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity) -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared) + +change domain and def +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "has author" SubPropertyOf: OEO_00140008 Domain: - OEO_00000274 or + Range: some OEO_00000064 @@ -504,14 +508,18 @@ ObjectProperty: OEO_00000507 Annotations: "A relation that holds between an information content entity / model and the client that requested its creation."@en, "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity) -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared) + +change domain +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "has client" SubPropertyOf: OEO_00140008 Domain: - OEO_00000274 or + OEO_00020352 or Range: some OEO_00000087 @@ -520,16 +528,20 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain an ObjectProperty: OEO_00000508 Annotations: - "A relation that holds between an information content entity / model and the person to contact with issues about it."@en, + "A relation that holds between an information content entity and the person to contact with issues about it."@en, "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity) -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared) + +change domain and definition +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "has contact person" SubPropertyOf: OEO_00140008 Domain: - OEO_00000274 or + OEO_00020352 or Range: some OEO_00000107 @@ -556,7 +568,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871" ObjectProperty: OEO_00000510 Annotations: - "A relation that holds between an information content entity or model and the organisation in which it was created."@en, + "A relation that holds between an information content entity and the organisation in which it was created."@en, "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity) pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared) @@ -566,14 +578,18 @@ https://github.com/OpenEnergyPlatform/ontology/pull/1042 Relabel to `has organisation` issue: https://github.com/OpenEnergyPlatform/ontology/issues/1161 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1226", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1226 + +change domain and definition +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "has organisation" SubPropertyOf: OEO_00140008 Domain: - OEO_00000274 or + Range: @@ -1067,7 +1083,11 @@ ObjectProperty: OEO_00140008 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/530 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/556 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity) -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)", +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared) + +change domain +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "has contributor"@en Domain: From e0a2407a6b663397e977143f0daa370ae36bdd1b Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 23 Oct 2023 10:30:54 +0200 Subject: [PATCH 08/21] changelog #1444 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d2dd193b..e0e1e35ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,13 +16,14 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ - New files for new OMO v2023-08-23 import process (#1646) - new module oeo-shared-axioms.omn (#1649) - acceptance (#1698) - +- generic model class, mathematical model, scale model, model role (#1707) ### Changed - energy transformation (#1625) - economy, economic scenario, trarget driven scenario, explorative scenario, policy scenario (#1642) - regionalistaion (#1644) - oeo.omn imports (#1649) +- model relabeled to numerical computer model, model, has contributor and subclasses (#1707) ### Removed - import and annotation scripts removed from repo. New repo is https://github.com/OpenEnergyPlatform/oeo-tools (#1686) From ed7f837ea866c01ef1de737ca259bb08af0514cc Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:16:17 +0200 Subject: [PATCH 09/21] Update src/ontology/edits/oeo-model.omn Co-authored-by: l-emele <36884905+l-emele@users.noreply.github.com> --- src/ontology/edits/oeo-model.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index 6156d472b..db592f0f7 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -951,7 +951,7 @@ Class: OEO_00000274 Annotations: OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", "A numerical computer model is a mathematical model that is calculated by a computer."@en, - "formally called \"model\"", + "formerly called \"model\"", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/180 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/349 From 8de368860ac8de12309d13acbb3e161643b616fa Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:16:29 +0200 Subject: [PATCH 10/21] Update src/ontology/edits/oeo-model.omn Co-authored-by: l-emele <36884905+l-emele@users.noreply.github.com> --- src/ontology/edits/oeo-model.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index db592f0f7..f922ae593 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -2524,7 +2524,7 @@ Class: OEO_00020353 Class: OEO_00020354 Annotations: - "An mathematical model is a information content artifact that represents a system and its behaviours mathematically.", + "A mathematical model is a information content artifact that represents a system and its behaviours mathematically.", "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "mathematical model" From 314a0d3300e4462e97b01a76e9b2de5b616e3701 Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:16:42 +0200 Subject: [PATCH 11/21] Update src/ontology/edits/oeo-shared.omn Co-authored-by: l-emele <36884905+l-emele@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 0497694cf..f65b78243 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -1563,7 +1563,7 @@ Class: OEO_00020353 Annotations: "A model role is a a role of a continuant for representing a system and its behaviours in a simplified or idealised way.", - "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444 + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", rdfs:label "model role" From 6d6fd496f146a19cc85ceb9939ba6da97242e3a3 Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:17:03 +0200 Subject: [PATCH 12/21] Update src/ontology/edits/oeo-shared.omn Co-authored-by: l-emele <36884905+l-emele@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 f65b78243..7c6b61a83 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -459,7 +459,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain an rework module structure issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652" +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652 change domain and def issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444 From 80eda3b9b2a07a2d45b4b7fa7ada523cdce1b407 Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 23 Oct 2023 21:35:17 +0200 Subject: [PATCH 13/21] copy organisation role and client to oeo-shared --- src/ontology/edits/oeo-shared.omn | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 7c6b61a83..709181145 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -1080,6 +1080,20 @@ issue: https://github.com/OpenEnergyPlatform/ontology/issues/1275 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1547" +Class: OEO_00000087 + + Annotations: + OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", + "A client is an agent that receives a product or service.", + "rework module structure +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", + rdfs:label "client" + + SubClassOf: + OEO_00000051 + + Class: @@ -1244,7 +1258,27 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/810" , OEO_00010121 some + +Class: OEO_00000315 + + Annotations: + OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", + "An organisation role is a role of an aggregate of people that has a collective goal and a set of organisation rules.", + "organization role", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/314 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/370 +rework module structure +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652 +remove disjointness with person +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1702 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1716", + rdfs:label "organisation role" + SubClassOf: + + + Class: OEO_00000323 Annotations: From 57cb1ffe5e2f45a81b5b12398e76bda88b04cd3d Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 23 Oct 2023 21:37:59 +0200 Subject: [PATCH 14/21] remove client from oeo-social --- src/ontology/edits/oeo-social.omn | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index ce998d3de..6c424e1dc 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -438,17 +438,6 @@ Class: OEO_00000064 Class: OEO_00000087 - Annotations: - OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", - "A client is an agent that receives a product or service.", - "rework module structure -issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", - rdfs:label "client" - - SubClassOf: - OEO_00000051 - Class: OEO_00000105 From 4907b3cf399bafeccada5b6b3caab856e9354b5a Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 23 Oct 2023 21:39:18 +0200 Subject: [PATCH 15/21] remove organisational role from oeo-social --- src/ontology/edits/oeo-social.omn | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index 6c424e1dc..03149d5b1 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -471,23 +471,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", Class: OEO_00000315 - Annotations: - OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", - "An organisation role is a role of an aggregate of people that has a collective goal and a set of organisation rules.", - "organization role", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/314 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/370 -rework module structure -issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652 -remove disjointness with person -issue: https://github.com/OpenEnergyPlatform/ontology/issues/1702 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1716", - rdfs:label "organisation role" - - SubClassOf: - - Class: OEO_00000323 From a86e06020b6d6065c3041c5006f4c93974b1eefd Mon Sep 17 00:00:00 2001 From: stap-m Date: Tue, 24 Oct 2023 08:39:49 +0200 Subject: [PATCH 16/21] move back client --- src/ontology/edits/oeo-social.omn | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index 03149d5b1..76c124bf3 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -438,6 +438,17 @@ Class: OEO_00000064 Class: OEO_00000087 + Annotations: + OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", + "A client is an agent that receives a product or service.", + "rework module structure +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", + rdfs:label "client" + + SubClassOf: + OEO_00000051 + Class: OEO_00000105 From 7f0b98688634463252b0a4e2858adf4f2201a41d Mon Sep 17 00:00:00 2001 From: stap-m Date: Tue, 24 Oct 2023 08:50:14 +0200 Subject: [PATCH 17/21] clean axioms of has contributor, has author, has client --- src/ontology/edits/oeo-model.omn | 12 ---------- src/ontology/edits/oeo-shared.omn | 38 +++++++++++++++---------------- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index f922ae593..4ca7b2cfb 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -115,18 +115,9 @@ ObjectProperty: OEO_00000504 ObjectProperty: OEO_00000506 - Domain: - OEO_00000274 or - - Range: - some OEO_00000064 - ObjectProperty: OEO_00000507 - Domain: - OEO_00000274 or - ObjectProperty: OEO_00000508 @@ -453,9 +444,6 @@ ObjectProperty: OEO_00140002 ObjectProperty: OEO_00140008 - Domain: - OEO_00000274 or - ObjectProperty: OEO_00140093 diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 709181145..ea2be9a8a 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -498,9 +498,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", Domain: OEO_00020352 or - Range: - some OEO_00000087 - ObjectProperty: OEO_00000508 @@ -527,6 +524,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", Range: some OEO_00000107 + ObjectProperty: OEO_00000509 Annotations: @@ -1080,20 +1078,6 @@ issue: https://github.com/OpenEnergyPlatform/ontology/issues/1275 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1547" -Class: OEO_00000087 - - Annotations: - OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", - "A client is an agent that receives a product or service.", - "rework module structure -issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", - rdfs:label "client" - - SubClassOf: - OEO_00000051 - - Class: @@ -1203,6 +1187,20 @@ Class: OEO_00000064 OEO_00000051 +Class: OEO_00000087 + + Annotations: + OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", + "A client is an agent that receives a product or service.", + "rework module structure +issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", + rdfs:label "client" + + SubClassOf: + OEO_00000051 + + Class: OEO_00000107 Annotations: @@ -1258,7 +1256,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/810" , OEO_00010121 some - + Class: OEO_00000315 Annotations: @@ -1277,8 +1275,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1716", SubClassOf: - - + + Class: OEO_00000323 Annotations: From 6147ca2ae1dd8742a0fd93de52ade077ff929d88 Mon Sep 17 00:00:00 2001 From: stap-m Date: Tue, 24 Oct 2023 08:57:19 +0200 Subject: [PATCH 18/21] clean axioms of has contact person, has organisation --- src/ontology/edits/oeo-model.omn | 6 ------ src/ontology/edits/oeo-sector.omn | 22 +++++++++------------- src/ontology/edits/oeo-shared.omn | 5 +---- src/ontology/edits/oeo-social.omn | 9 +-------- 4 files changed, 11 insertions(+), 31 deletions(-) diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn index 4ca7b2cfb..404a19451 100644 --- a/src/ontology/edits/oeo-model.omn +++ b/src/ontology/edits/oeo-model.omn @@ -121,15 +121,9 @@ ObjectProperty: OEO_00000507 ObjectProperty: OEO_00000508 - Domain: - OEO_00000274 or - ObjectProperty: OEO_00000510 - Domain: - OEO_00000274 or - ObjectProperty: OEO_00000511 diff --git a/src/ontology/edits/oeo-sector.omn b/src/ontology/edits/oeo-sector.omn index 72cd0ccae..d58f11185 100644 --- a/src/ontology/edits/oeo-sector.omn +++ b/src/ontology/edits/oeo-sector.omn @@ -127,9 +127,6 @@ ObjectProperty: OEO_00000507 ObjectProperty: OEO_00000508 - Range: - some OEO_00000107 - ObjectProperty: OEO_00000509 @@ -927,7 +924,7 @@ NACE is a four-digit classification providing the framework for collecting and p "https://ec.europa.eu/eurostat/statistics-explained/index.php?title=Glossary:Statistical_classification_of_economic_activities_in_the_European_Community_(NACE)", "move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", - rdfs:label "nace_ sectors" + rdfs:label "nace_ sectors" Types: OEO_00000368 @@ -2279,7 +2276,7 @@ Individual: OEO_00010172 Emissions of sulphur hexafluoride (SF6) and perfluorocarbons (PFCs) from the manufacture and use of electrical equipment and a number of other products. It also includes emissions of nitrous oxide (N2O) from several products.", "2006 IPCC Guidelines for National Greenhouse Gas Inventories, Volume 3, Chapter 8.1, https://www.ipcc-nggip.iges.or.jp/public/2006gl/", - "move to oeo-sector: issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 + "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): other product manufacture and use"@en @@ -2861,8 +2858,7 @@ Individual: OEO_00010197 Annotations: "Term used by the European Environment Agency (EEA) https://climate-energy.eea.europa.eu/topics/climate-change-mitigation/greenhouse-gas-emissions-inventory/data" "Total emissions: (UNFCCC)", - - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/928 + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/928 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/944 move to oeo-sector @@ -3130,7 +3126,7 @@ Individual: OEO_00010206 Annotations: "Term used by the European Environment Agency (EEA): https://climate-energy.eea.europa.eu/topics/climate-change-mitigation/greenhouse-gas-emissions-inventory/data" "total emissions with international transport (EEA)", - "move to oeo-sector + "move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", rdfs:label "total emissions excluding LULUCF and including international bunkers"@en @@ -3155,7 +3151,7 @@ Individual: OEO_00010207 "move to oeo-sector issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", - rdfs:label "total emissions including LULUCF and including international bunkers"@en + rdfs:label "total emissions including LULUCF and including international bunkers"@en Types: OEO_00000367 @@ -3471,7 +3467,7 @@ Individual: OEO_00010338 This comprises fugitive emissions from the systems used to transport captured CO2 from the source to the injection site. These emissions may comprise losses due to fugitive equipment leaks, venting and releases due to pipeline ruptures or other accidental releases (e.g., temporary storage).", "2006 IPCC Guidelines for National Greenhouse Gas Inventories, Volume 1, Chapter 8.5, https://www.ipcc-nggip.iges.or.jp/public/2006gl/", - "move to oeo-sector + "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): transport of CO2"@en @@ -3494,7 +3490,7 @@ Fugitive emissions from activities and equipment at the injection site and those "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): injection and storage"@en + rdfs:label "CRF sector (IPCC 2006): injection and storage"@en Types: OEO_00000367 @@ -3511,7 +3507,7 @@ Individual: OEO_00010340 "The CRF sector (IPCC 2006) 'CO2 transport and storage' is a sector defined by the 2006 IPCC Guidelines for National Greenhouse Gas Inventories: Any other emissions from CCS not reported elsewhere.", "2006 IPCC Guidelines for National Greenhouse Gas Inventories, Volume 1, Chapter 8.5, https://www.ipcc-nggip.iges.or.jp/public/2006gl/", - "move to oeo-sector + "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): CO2 transport and storage - other"@en @@ -4020,7 +4016,7 @@ Individual: OEO_00010365 "The CRF sector (IPCC 2006) 'photovoltaics' is an industry sector defined by the 2006 IPCC Guidelines for National Greenhouse Gas Inventories: Photovoltaic cell manufacture may use and emit CF4 and C2F6 among others.", "2006 IPCC Guidelines for National Greenhouse Gas Inventories, Volume 1, Chapter 8.5, https://www.ipcc-nggip.iges.or.jp/public/2006gl/", - "move to oeo-sector + "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): photovoltaics"@en diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index ea2be9a8a..230b0457c 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -519,10 +519,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", OEO_00140008 Domain: - OEO_00020352 or - - Range: - some OEO_00000107 + ObjectProperty: OEO_00000509 diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index 76c124bf3..ef58f1632 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -136,13 +136,6 @@ ObjectProperty: OEO_00000509 ObjectProperty: OEO_00000510 - Range: - - Annotations: "Replace `institution` as range by `organisation role` -issue: https://github.com/OpenEnergyPlatform/ontology/issues/1161 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1200" - some OEO_00000315 - ObjectProperty: OEO_00000522 @@ -448,7 +441,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", SubClassOf: OEO_00000051 - + Class: OEO_00000105 From 1bf8d5584b0827b2473bffb33d0d37a1079774f8 Mon Sep 17 00:00:00 2001 From: stap-m Date: Tue, 24 Oct 2023 08:58:45 +0200 Subject: [PATCH 19/21] clean client --- src/ontology/edits/oeo-shared.omn | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 230b0457c..9a7d99092 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -1186,17 +1186,6 @@ Class: OEO_00000064 Class: OEO_00000087 - Annotations: - OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared", - "A client is an agent that receives a product or service.", - "rework module structure -issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652", - rdfs:label "client" - - SubClassOf: - OEO_00000051 - Class: OEO_00000107 From 6d81013df2e207a3c3b2fb3b78de05e64df6c452 Mon Sep 17 00:00:00 2001 From: stap-m Date: Tue, 24 Oct 2023 09:15:34 +0200 Subject: [PATCH 20/21] clean has member and member of --- src/ontology/edits/oeo-sector.omn | 25 ------------------------- src/ontology/edits/oeo-shared.omn | 9 --------- 2 files changed, 34 deletions(-) diff --git a/src/ontology/edits/oeo-sector.omn b/src/ontology/edits/oeo-sector.omn index d58f11185..a83303605 100644 --- a/src/ontology/edits/oeo-sector.omn +++ b/src/ontology/edits/oeo-sector.omn @@ -200,34 +200,9 @@ issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", rdfs:label "member of"@en - Domain: - OEO_00000323 - - Range: - OEO_00030022 - ObjectProperty: OEO_00140018 - Annotations: - "A relation between an organisation and a person where the person is a member of the organisation.", - "issue: https://github.com/OpenEnergyPlatform/ontology/issues/486 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/562 - -move to oeo-sector -issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399 -pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724", - rdfs:label "has member"@en - - SubPropertyOf: - owl:topObjectProperty - - Domain: - OEO_00030022 - - Range: - OEO_00000323 - ObjectProperty: OEO_00140164 diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index 9a7d99092..c1c8b35b7 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -578,15 +578,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707", some OEO_00000315 -ObjectProperty: OEO_00000514 - - -ObjectProperty: OEO_00000515 - - -ObjectProperty: OEO_00000516 - - ObjectProperty: OEO_00000522 Annotations: From 1e5af795d979558db000f0288da3c634cbdf20b2 Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:30:25 +0200 Subject: [PATCH 21/21] Update src/ontology/edits/oeo-shared.omn Co-authored-by: l-emele <36884905+l-emele@users.noreply.github.com> --- src/ontology/edits/oeo-shared.omn | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn index c1c8b35b7..c30bc3c12 100644 --- a/src/ontology/edits/oeo-shared.omn +++ b/src/ontology/edits/oeo-shared.omn @@ -1175,7 +1175,6 @@ Class: OEO_00000064 OEO_00000051 -Class: OEO_00000087 Class: OEO_00000107