Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

monetary value and price #1902 #1915

Merged
merged 16 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- economic instrument function, education instrument function, information instrument function, regulatory instrument function, voluntary agreement instrument function (#1906)
- product (#1912)
- term tracker annotation (#1913)
- monetary price (new entity) (#1902)

### Changed
- gams -> General Algebraic Modeling System (#1889)
Expand All @@ -27,6 +28,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- economic instrument, education instrument, information instrument, regulatory instrument, voluntary agreement instrument (#1906)
- is traded at, trades (#1912)
- replace term tracker item with term tracker annotation (#1922, #1923)
- monetary value (formerly: monetary price) and subclasses (#1902)

### Removed

Expand Down
32 changes: 32 additions & 0 deletions src/ontology/edits/oeo-shared-axioms.omn
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,9 @@ Class: OEO_00010255
Class: OEO_00010268

SubClassOf:
OEO_00020056 some
(OEO_00000147
and (<http://purl.obolibrary.org/obo/RO_0000053> some OEO_00020427)),
OEO_00020179 some OEO_00140081


Expand Down Expand Up @@ -666,6 +669,14 @@ Class: OEO_00020072
Class: OEO_00020093


Class: OEO_00020117

SubClassOf:
OEO_00020056 some
(OEO_00000139
and (<http://purl.obolibrary.org/obo/RO_0000053> some OEO_00020427))


Class: OEO_00020121


Expand Down Expand Up @@ -748,6 +759,9 @@ Class: OEO_00020411
and (<http://purl.obolibrary.org/obo/RO_0000091> some OEO_00020410)))


Class: OEO_00020427


Class: OEO_00030007

EquivalentTo:
Expand Down Expand Up @@ -909,6 +923,24 @@ Class: OEO_00240035
<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00040011


Class: OEO_00240036

SubClassOf:
OEO_00020056 some
(OEO_00010116
and (<http://purl.obolibrary.org/obo/RO_0000053> some OEO_00020427)
and (<http://purl.obolibrary.org/obo/RO_0000056> some OEO_00020201))


Class: OEO_00240037

SubClassOf:
OEO_00020056 some
(OEO_00010116
and (<http://purl.obolibrary.org/obo/RO_0000053> some OEO_00020427)
and (<http://purl.obolibrary.org/obo/RO_0000056> some OEO_00020202))


Class: OEO_00260007


Expand Down
54 changes: 44 additions & 10 deletions src/ontology/edits/oeo-social.omn
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000056>
ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000057>


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


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


Expand Down Expand Up @@ -705,7 +708,10 @@ Class: OEO_00010268
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1253
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
add axiom to oeo-shared-axioms
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1902
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1915",
<http://purl.obolibrary.org/obo/IAO_0000115> "An emission price is a monetary price of emitting a certain emission value.",
<http://purl.obolibrary.org/obo/IAO_0000118> "Emissionspreis"@de,
rdfs:label "emission price"@en
Expand Down Expand Up @@ -946,10 +952,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1906",
<http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00010457



Class: OEO_00010489


Class: OEO_00010492

Annotations:
Expand Down Expand Up @@ -1404,6 +1409,11 @@ Class: OEO_00020117
Annotations:
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/335
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/910",
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/335
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/910
add axiom in oeo-shared-axioms
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1902
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1915",
<http://purl.obolibrary.org/obo/IAO_0000112> "The electricity price is Y EUR per megawatt-hour.",
<http://purl.obolibrary.org/obo/IAO_0000115> "Electricity price is the monetary price per energy unit of electricity.",
<http://purl.obolibrary.org/obo/IAO_0000118> "Strompreis"@de,
Expand Down Expand Up @@ -1720,6 +1730,20 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
OEO_00040009


Class: OEO_00020427

Annotations:
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1902
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1915",
<http://purl.obolibrary.org/obo/IAO_0000115> "A monetary price is a quality of a good that indicates the value in terms of the amount of money requested, expected, required or given in exchange for something else.",
stap-m marked this conversation as resolved.
Show resolved Hide resolved
rdfs:label "monetary price"

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000019>,
OEO_00140002 some OEO_00040003,
<http://purl.obolibrary.org/obo/RO_0000080> some OEO_00010501


Class: OEO_00030016

Annotations:
Expand Down Expand Up @@ -1805,6 +1829,10 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
Class: OEO_00040003

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A monetary value is a quantity value that states the amount of money specified in monetary units.",
<http://purl.obolibrary.org/obo/IAO_0000118> "Geldwert"@de,
<http://purl.obolibrary.org/obo/IAO_0000118> "amount of money",
<http://purl.obolibrary.org/obo/IAO_0000119> "fibo-fnd-acc-cur:MonetaryPrice",
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/331
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/640
move to oeo-shared
Expand All @@ -1813,11 +1841,11 @@ add relation to good
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1034
rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
<http://purl.obolibrary.org/obo/IAO_0000115> "A monetary price is an economic value that describes the amount of money requested, expected, required or given in exchange for something else.",
<http://purl.obolibrary.org/obo/IAO_0000118> "monetärer Preis"@de,
<http://purl.obolibrary.org/obo/IAO_0000119> "fibo-fnd-acc-cur:MonetaryPrice",
rdfs:label "monetary price"@en,
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
relabel as monetary value
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1902
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1915",
rdfs:label "monetary value"@en,
rdfs:seeAlso "https://spec.edmcouncil.org/fibo/ontology/FND/Accounting/CurrencyAmount/MonetaryPrice"

SubClassOf:
Expand Down Expand Up @@ -2521,7 +2549,10 @@ Class: OEO_00240036

Annotations:
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1050
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1083",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1083
add axiom to oeo-shared-axioms
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1902
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1915",
<http://purl.obolibrary.org/obo/IAO_0000115> "An import price is the monetary price for the import of a material entity."@en,
<http://purl.obolibrary.org/obo/IAO_0000118> "Importpreis"@de,
rdfs:label "import price"@en
Expand All @@ -2534,7 +2565,10 @@ Class: OEO_00240037

Annotations:
OEO_00020426 "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1050
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1083",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1083
add axiom to oeo-shared-axioms
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1902
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1915",
<http://purl.obolibrary.org/obo/IAO_0000115> "An export price is the monetary price for the export of a material entity."@en,
<http://purl.obolibrary.org/obo/IAO_0000118> "Exportpreis"@de,
rdfs:label "export price"@en
Expand Down
Loading