Merge branch 'dev' into feature/sector-division-#461

OpenEnergyPlatform · Aug 17, 2020 · 5bcd8b8 · 5bcd8b8
2 parents d7039ae + ce4351a
commit 5bcd8b8
Show file tree

Hide file tree

Showing 7 changed files with 555 additions and 398 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,12 +26,18 @@ Here is a template for new release sections
 - factsheet-covers-relationships (#440)
 - oeo-shared module (#450)
 - object property definitions (#478)
+- energy and supply system (#493)
+- primary energy production and subclasses (#498)
+- study and study report (#497)
+- exogeneous, endogeneous data (#482)
+- hub height, length value and has quantity value (#505)
 
 ### Changed
 - move object properties to oeo-shared (#472)
 - definition of sector and sector subclasses (#477, #484)
 - definition of sector (#477)
 - object property conforms_to renamed to is_defined_by (#480)
+- model calculation (#504)
 
 ### Removed
 - unused object properties (#452)

diff --git a/README.md b/README.md
@@ -32,6 +32,8 @@ This is an interdisciplinary, open source project, help is always appreciated!
 
 The development of the ontology happens mainly on [GitHub](https://github.com/OpenEnergyPlatform/ontology) and is supplemented by (online) developer meetings to review the progress and discuss more complicated topics. 
 
+If you're new to GitHub or ontologies check out our [how-to-help](https://github.com/OpenEnergyPlatform/ontology/wiki/How-to-help) article for some first advice and helpful links.
+
 Please read the [wiki](https://github.com/OpenEnergyPlatform/ontology/wiki) for information about the ontology, its standards, its best practice principles and on BFO classification.
 
 The workflow is described in the [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/ontology/blob/dev/CONTRIBUTING.md) file. Please check it out **before** you start working on this project. Points that are not clear in the file can be discussed in a [GitHub issue](https://github.com/OpenEnergyPlatform/ontology/issues/new/choose).

diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn
@@ -86,130 +86,117 @@ ObjectProperty: <http://purl.obolibrary.org/obo/RO_0002233>
 ObjectProperty: <http://purl.obolibrary.org/obo/RO_0002234>
 
 
-ObjectProperty: covers
+ObjectProperty: <http://purl.obolibrary.org/obo/RO_0002353>
 
 
-ObjectProperty: has_author
+ObjectProperty: OEO_00000503
 
 
-ObjectProperty: has_client
-
-
-ObjectProperty: has_constraint
+ObjectProperty: OEO_00000511
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a transformation and the constraints it has to fulfill."@en
-
-    SubPropertyOf: 
-        <http://purl.obolibrary.org/obo/RO_0002233>
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an optimization and its objective function or objective variable."@en,
+        rdfs:label "has_objective"
 
+    Domain: 
+        OEO_00000313
 
-ObjectProperty: has_contact
-
-
-ObjectProperty: has_funding_source
-
 
-ObjectProperty: has_numercical_input
+ObjectProperty: OEO_00000512
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a transformation and its input."@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an optimization and its objective function."@en,
+        rdfs:label "has_objectivefunction"
 
     SubPropertyOf: 
-        <http://purl.obolibrary.org/obo/RO_0002233>
-
-    Characteristics: 
-        Irreflexive,
-        Asymmetric
-
-    Domain: 
-        OEO_00000419
+        OEO_00000511
 
 
-ObjectProperty: has_numerical_output
+ObjectProperty: OEO_00000513
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a transformation and its output."@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an optimization and its objective variable."@en,
+        rdfs:label "has_objectivevariable"
 
     SubPropertyOf: 
-        <http://purl.obolibrary.org/obo/RO_0002234>
+        OEO_00000511
 
-    Characteristics: 
-        Irreflexive,
-        Asymmetric
 
-    Domain: 
-        OEO_00000419
+ObjectProperty: OEO_00000514
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a publication/model/model calculation and the resolution it uses."@en,
+        rdfs:label "has_resolution"
 
 
-ObjectProperty: has_objective
+ObjectProperty: OEO_00000515
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an optimization and its objective function or objective variable."@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation thst holds between a publication/model/model calculation and the spacial resolution it uses."@en,
+        rdfs:label "has_spatial_resolution"
 
-    Domain: 
-        OEO_00000313
+    SubPropertyOf: 
+        OEO_00000514
 
 
-ObjectProperty: has_objectivefunction
+ObjectProperty: OEO_00000516
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an optimization and its objective function."@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation thst holds between a publication/model/model calculation and the time resolution it uses."@en,
+        rdfs:label "has_temporal_resolution"
 
     SubPropertyOf: 
-        has_objective
+        OEO_00000514
 
 
-ObjectProperty: has_objectivevariable
+ObjectProperty: OEO_00000517
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an optimization and its objective variable."@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a transformation and the constraints it has to fulfill."@en,
+        rdfs:label "has_constraint"
 
     SubPropertyOf: 
-        has_objective
+        <http://purl.obolibrary.org/obo/RO_0002233>
 
 
-ObjectProperty: has_physical_output
+ObjectProperty: OEO_00000518
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a transformation and its output."@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a transformation and its input."@en,
+        rdfs:label "has_numerical_input"
 
     SubPropertyOf: 
-        <http://purl.obolibrary.org/obo/RO_0002234>
+        <http://purl.obolibrary.org/obo/RO_0002233>
 
     Characteristics: 
         Irreflexive,
         Asymmetric
 
-
-ObjectProperty: has_resolution
-
-    Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a publication/model/model calculation and the resolution it uses."@en
+    Domain: 
+        OEO_00000419
 
 
-ObjectProperty: has_spatial_resolution
+ObjectProperty: OEO_00000519
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation thst holds between a publication/model/model calculation and the spacial resolution it uses."@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between a transformation and its output."@en,
+        rdfs:label "has_numerical_output"
 
     SubPropertyOf: 
-        has_resolution
-
+        <http://purl.obolibrary.org/obo/RO_0002234>
 
-ObjectProperty: has_temporal_resolution
-
-    Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation thst holds between a publication/model/model calculation and the time resolution it uses."@en
+    Characteristics: 
+        Irreflexive,
+        Asymmetric
 
-    SubPropertyOf: 
-        has_resolution
+    Domain: 
+        OEO_00000419
 
 
-ObjectProperty: owl:topObjectProperty
+ObjectProperty: OEO_00000522
 
 
-ObjectProperty: uses
+ObjectProperty: owl:topObjectProperty
 
 
 Class: <http://purl.obolibrary.org/obo/BFO_0000002>
@@ -272,6 +259,9 @@ Class: <http://purl.obolibrary.org/obo/IAO_0000030>
         <http://purl.obolibrary.org/obo/BFO_0000031>
 
 
+Class: <http://purl.obolibrary.org/obo/IAO_0000088>
+
+
 Class: <http://purl.obolibrary.org/obo/IAO_0000100>
 
 
@@ -514,7 +504,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/440",
 
     SubClassOf: 
         OEO_00000162,
-        covers some OEO_00000382
+        OEO_00000522 some OEO_00000382
 
 
 Class: OEO_00000202
@@ -588,12 +578,14 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/287",
 Class: OEO_00000275
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A model calculation is a transformation using at least one model."@en,
+        definition "A model calculation is a process of solving mathematical equations of a model."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/73
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/504"@en,
         rdfs:label "model calculation"
 
     SubClassOf: 
-        OEO_00000419,
-        uses some OEO_00000274
+        <http://purl.obolibrary.org/obo/BFO_0000015>,
+        OEO_00000503 some OEO_00000274
 
 
 Class: OEO_00000276
@@ -620,7 +612,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/440",
 
     SubClassOf: 
         OEO_00000162,
-        covers some OEO_00000274
+        OEO_00000522 some OEO_00000274
 
 
 Class: OEO_00000279
@@ -766,7 +758,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/440",
 
     SubClassOf: 
         OEO_00000162,
-        covers some OEO_00000364
+        OEO_00000522 some OEO_00000364
 
 
 Class: OEO_00000370
@@ -916,6 +908,31 @@ Class: OEO_00000435
         <http://purl.obolibrary.org/obo/IAO_0000030>
 
 
+Class: OEO_00020011
+
+    Annotations: 
+        definition "A study is a project with the goal to investigate something."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/247
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/497"@en,
+        rdfs:label "study"@en
+
+    SubClassOf: 
+        OEO_00000340
+
+
+Class: OEO_00020012
+
+    Annotations: 
+        definition "A study report is a report that is the output from some study."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/247
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/497"@en,
+        rdfs:label "study report"@en
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/IAO_0000088>,
+        <http://purl.obolibrary.org/obo/RO_0002353> some OEO_00020011
+
+
 Class: OEO_00030007
 
     Annotations: 
@@ -976,6 +993,30 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/358",
         OEO_00000274
 
 
+Class: OEO_00030029
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Exogeneous data is a data item whose quantity value is determined outside of a model and is imposed on a model.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/482
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/500",
+        rdfs:label "exogeneous data"
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/IAO_0000027>
+
+
+Class: OEO_00030030
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Endogeneous data is a data item whose quantity value is determined by a model.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/482
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/500",
+        rdfs:label "endogeneous data"
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/IAO_0000027>
+
+
 Individual: OEO_00000049
 
     Annotations: