Skip to content

Commit

Permalink
Merge pull request #1928 from OpenEnergyPlatform/feature-1907-replace…
Browse files Browse the repository at this point in the history
…-has-bearer-with-characteristic-of

replaced 'has bearer' with 'characteristic of'
  • Loading branch information
stap-m authored Sep 24, 2024
2 parents 9486ae5 + 17af09e commit 90bf1f8
Show file tree
Hide file tree
Showing 8 changed files with 343 additions and 136 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- is traded at, trades (#1912)
- replace term tracker item with term tracker annotation (#1922, #1923)
- monetary value (formerly: monetary price) and subclasses (#1902)
- replace has bearer with characteristic of (#1928)

### Obsoletion
- economic value, has economic value, economic value (#1931)
- has bearer (#1928)

### Removed

Expand Down
30 changes: 15 additions & 15 deletions src/ontology/edits/catalog-v001.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-model.omn" uri="oeo-model.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical.omn" uri="oeo-physical.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-sector.omn" uri="oeo-sector.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-social.omn" uri="oeo-social.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-shared.omn" uri="oeo-shared.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-extracted.owl" uri="../imports/iao-extracted.owl"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl" uri="../imports/ro-extracted.owl"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/uo-extracted.owl" uri="../imports/uo-extracted.owl"/>
<group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
<uri id="Automatically generated entry, Timestamp=1726663233777" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
<uri id="Automatically generated entry, Timestamp=1726663233777" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
</group>
</catalog>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-model.omn" uri="oeo-model.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical.omn" uri="oeo-physical.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-sector.omn" uri="oeo-sector.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-social.omn" uri="oeo-social.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-shared.omn" uri="oeo-shared.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/iao-extracted.owl" uri="../imports/iao-extracted.owl"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl" uri="../imports/ro-extracted.owl"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/uo-extracted.owl" uri="../imports/uo-extracted.owl"/>
<group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
<uri id="Automatically generated entry, Timestamp=1726817551697" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
<uri id="Automatically generated entry, Timestamp=1726817551697" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
</group>
</catalog>
18 changes: 17 additions & 1 deletion src/ontology/edits/oeo-import-edits.owl
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,23 @@ pull-request: https://github.com/OpenEnergyPlatform/ontology/pull/1136</oeo:OEO_

<!-- http://purl.obolibrary.org/obo/BFO_0000016 -->

<owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000016"/>
<owl:Class rdf:about="http://purl.obolibrary.org/obo/BFO_0000016">
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/RO_0000052"/>
<owl:someValuesFrom rdf:resource="http://purl.obolibrary.org/obo/BFO_0000004"/>
</owl:Restriction>
</rdfs:subClassOf>
<oeo:OEO_00020426>add bearer axiom to oeo-import-edits
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1305
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1485
move bearer axiom to oeo-shared
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1738
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1776
replaced &apos;has bearer&apos; with &apos;characteristic of&apos; in oeo-shared
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1907
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1928</oeo:OEO_00020426>
</owl:Class>



Expand Down
59 changes: 45 additions & 14 deletions src/ontology/edits/oeo-model.omn
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ ObjectProperty: <http://purl.obolibrary.org/obo/BFO_0000051>

ObjectProperty: <http://purl.obolibrary.org/obo/IAO_0000136>


ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000052>


ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000056>

Expand Down Expand Up @@ -2320,14 +2323,18 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1310

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

replaced 'has bearer' with 'characteristic of'
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1907
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1928",
<http://purl.obolibrary.org/obo/IAO_0000115> "Resolution is a quality of a dataset that indicates the level of detail of the data.",
<http://purl.obolibrary.org/obo/IAO_0000118> "Auflösung"@de,
rdfs:label "resolution"@en

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000019>,
OEO_00010121 some <http://purl.obolibrary.org/obo/IAO_0000100>
<http://purl.obolibrary.org/obo/RO_0000052> some <http://purl.obolibrary.org/obo/IAO_0000100>


Class: OEO_00020122
Expand All @@ -2345,14 +2352,18 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1310

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

replaced 'has bearer' with 'characteristic of'
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1907
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1928",
<http://purl.obolibrary.org/obo/IAO_0000115> "Temporal resolution is the resolution of a time series that indicates time-dependent the level of detail.",
<http://purl.obolibrary.org/obo/IAO_0000118> "zeitliche Auflösung"@de,
rdfs:label "temporal resolution"@en

SubClassOf:
OEO_00020121,
OEO_00010121 some OEO_00030034
<http://purl.obolibrary.org/obo/RO_0000052> some OEO_00030034

DisjointWith:
OEO_00020123
Expand Down Expand Up @@ -2584,14 +2595,18 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1614

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

replaced 'has bearer' with 'characteristic of'
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1907
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1928",
<http://purl.obolibrary.org/obo/IAO_0000115> "A role of an information content entity, that indicates a benchmark, e.g. in a comparison.",
<http://purl.obolibrary.org/obo/IAO_0000116> "Although contradicting to BFO2, we add the reference role to the generically dependent \"information content entity\", aware of the ongoing discussion.",
rdfs:label "reference role"@en

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000023>,
OEO_00010121 some OEO_00360020
<http://purl.obolibrary.org/obo/RO_0000052> some OEO_00360020


Class: OEO_00020314
Expand Down Expand Up @@ -3453,7 +3468,11 @@ Class: OEO_00360021

Annotations:
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749

replaced 'has bearer' with 'characteristic of'
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1907
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1928",
<http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
Expand All @@ -3463,14 +3482,18 @@ The union of the study region and the interacting/ external region ist the consi

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000023>,
OEO_00010121 some OEO_00360020
<http://purl.obolibrary.org/obo/RO_0000052> some OEO_00360020


Class: OEO_00360022

Annotations:
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749

replaced 'has bearer' with 'characteristic of'
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1907
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1928",
<http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
Expand All @@ -3480,14 +3503,18 @@ The union of the study region and the interacting/ external region ist the consi

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000023>,
OEO_00010121 some OEO_00360020
<http://purl.obolibrary.org/obo/RO_0000052> some OEO_00360020


Class: OEO_00360023

Annotations:
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749

replaced 'has bearer' with 'characteristic of'
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1907
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1928",
<http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
Expand All @@ -3497,20 +3524,24 @@ The union of the study region and the interacting/ external region ist the consi

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000023>,
OEO_00010121 some OEO_00360020
<http://purl.obolibrary.org/obo/RO_0000052> some OEO_00360020


Class: OEO_00360024

Annotations:
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749

replaced 'has bearer' with 'characteristic of'
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1907
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1928",
<http://purl.obolibrary.org/obo/IAO_0000115> "A study subregion role is a study region role that refers to a subregion."@en,
rdfs:label "study subregion role"@en

SubClassOf:
OEO_00360021,
OEO_00010121 some OEO_00020033
<http://purl.obolibrary.org/obo/RO_0000052> some OEO_00020033


Class: OEO_00360026
Expand Down
Loading

0 comments on commit 90bf1f8

Please sign in to comment.