Merge branch 'dev' into feature/timeseries-#267

CHANGELOG.md

@@ -32,14 +32,21 @@ Here is a template for new release sections
 - exogeneous, endogeneous data (#482)
 - hub height, length value and has quantity value (#505)
 - transport and subclasses (#517)
+- annotation property unique individual identifier (#523)
+- sector individuals (#523)
+- output and input data (#536)
 
 ### Changed
+- harmonise 'definition' annotation property (#529)
 - 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)
 - electrical energy definition (#524)
+- assumption (#525)
+- update original release date and teams in `README` (#535)
+- unit (#537)
 
 ### Removed
 - unused object properties (#452)

README.md

@@ -6,7 +6,7 @@ Developing a common ontology for energy system analysis and scenarios.
 
 ## Introduction
 
-The Open Energy Ontology (OEO) is a domain ontology of the energy-system modelling context. It is developed as part of the [Open Energy Family](https://github.com/OpenEnergyPlatform). The OEO is published on github as open source software. The language used is the Manchester OWL Syntax, which was chosen because it is user-friendly for editing and viewing diffs of edited files. The OEO is still under development and not released yet. A steering committee was created to accompany the development, increase awareness of the ontology and include it in current projects.
+The Open Energy Ontology (OEO) is a domain ontology of the energy-system modelling context. It is developed as part of the [Open Energy Family](https://github.com/OpenEnergyPlatform). The OEO is published on github as open source software. The language used is the Manchester OWL Syntax, which was chosen because it is user-friendly for editing and viewing diffs of edited files. The OEO is constantly being extended. The first version of the Open Energy Ontology (OEO) has been released on June 11th 2020. A steering committee was created to accompany the development, increase awareness of the ontology and include it in current projects.
 
 ## Scope of this ontology
 
@@ -45,9 +45,13 @@ We combine domain knowledge with knowledge about how an ontology should be desig
 If you have a specific question about ontology design, energy system modelling or economy (in context of this ontology), you can [tag](https://github.com/OmahaGirlsWhoCode/OmahaGirlsWhoCode/wiki/How-to-tag-someone-in-a-pull-request) one of these teams (or persons) to notify its members that you need their feedback or help.
 
 The OEO is organised in an general team: 
-- [@oeo-dev](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-dev/)
+- [@oeo-dev](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-dev)
 
 and several [subteams](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-dev/teams):
-- [@oeo-general-expert-formal-ontology](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-general-expert-formal-ontology)
-- [@oeo-domain-expert-energy-modelling ](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-domain-expert-energy-modelling)
+- [@oeo-concept-owner](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-concept-owner)
+- [@oeo-domain-expert-economy](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-domain-expert-economy)
+- [@oeo-domain-expert-energy-modelling](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-domain-expert-energy-modelling)
 - [@oeo-domain-expert-linked-open-data](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-domain-expert-linked-open-data)
+- [@oeo-domain-expert-meteorology](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-domain-expert-meteorology)
+- [@oeo-general-expert-formal-ontology](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-general-expert-formal-ontology)
+- [@oeo-general-steering-committee](https://github.com/orgs/OpenEnergyPlatform/teams/oeo-general-steering-committee)

src/ontology/edits/oeo-model.omn

@@ -50,12 +50,6 @@ AnnotationProperty: dc:description
 AnnotationProperty: dc:license
 
 
-AnnotationProperty: definition
-
-    SubPropertyOf: 
-        rdfs:comment
-
-
 AnnotationProperty: rdfs:comment
 
 
@@ -300,12 +294,14 @@ Class: OEO_00000059
 Class: OEO_00000063
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000112> "The predicted demographic development for a country in the future."@en,
-        <http://purl.obolibrary.org/obo/IAO_0000115> "An assumption is a statement about a property of a system or process that is considered to be true."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An assumption is an information content entity about a property of a system or process. It determines a part of a scenario content."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/353
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/525"@en,
         rdfs:label "assumption"
 
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/IAO_0000030>
+        <http://purl.obolibrary.org/obo/IAO_0000030>,
+        <http://purl.obolibrary.org/obo/BFO_0000050> some OEO_00000364
 
 
 Class: OEO_00000078
@@ -581,7 +577,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/287",
 Class: OEO_00000275
 
     Annotations: 
-        definition "A model calculation is a process of solving mathematical equations of a model."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "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"
@@ -914,7 +910,7 @@ Class: OEO_00000435
 Class: OEO_00020011
 
     Annotations: 
-        definition "A study is a project with the goal to investigate something."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "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
@@ -926,7 +922,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/497"@en,
 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_0000115> "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
@@ -936,6 +932,18 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/497"@en,
         <http://purl.obolibrary.org/obo/RO_0002353> some OEO_00020011
 
 
+Class: OEO_00020013
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Output data is endogenous data that is determined by a model calculation and presented as a result.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/520
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/536",
+        rdfs:label "output data"
+
+    SubClassOf: 
+        OEO_00030030
+
+
 Class: OEO_00030007
 
     Annotations: 
@@ -999,10 +1007,11 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/358",
 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_0000115> "Exogenous 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_0000118> "input data",
         <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"
+        rdfs:label "exogenous data"
 
     SubClassOf: 
         <http://purl.obolibrary.org/obo/IAO_0000027>
@@ -1011,10 +1020,10 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/500",
 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_0000115> "Endogenous 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"
+        rdfs:label "endogenous data"
 
     SubClassOf: 
         <http://purl.obolibrary.org/obo/IAO_0000027>