From 0aac1b591660704b5ce8ec9df2bbc80e6a979645 Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 18 Oct 2021 14:57:22 +0200 Subject: [PATCH 1/9] change currency #335 --- src/ontology/edits/oeo-social.omn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index 9a3f84a34..bba4bac4e 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -961,10 +961,12 @@ https://github.com/OpenEnergyPlatform/ontology/pull/640", Class: OEO_00040004 Annotations: + "The currency used in France in 2020 was Euro.", "A unit which is a measure of the medium of an exchange value, defined by reference to the geographical location of the monetary authorities responsible for it.", "fibo-fnd-acc-cur:Currency", "https://github.com/OpenEnergyPlatform/ontology/issues/331 https://github.com/OpenEnergyPlatform/ontology/pull/640", + rdfs:comment "Currency is the unit of monetary value as defined by each country.", rdfs:label "currency"@en, rdfs:seeAlso "https://spec.edmcouncil.org/fibo/ontology/FND/Accounting/CurrencyAmount/Currency" From ad0fb48925fd25ef746a611e82e7e3a098f81b66 Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 18 Oct 2021 15:08:57 +0200 Subject: [PATCH 2/9] add purchasing power parity #867 --- src/ontology/edits/oeo-social.omn | 42 ++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index bba4bac4e..c91790986 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -40,6 +40,9 @@ AnnotationProperty: AnnotationProperty: +AnnotationProperty: + + AnnotationProperty: @@ -315,6 +318,9 @@ Class: Class: +Class: + + Class: OEO_00000045 Annotations: @@ -861,6 +867,38 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/909", OEO_00020110 +Class: OEO_00020113 + + Annotations: + rdfs:label "inflation rate" + + SubClassOf: + + + +Class: OEO_00020114 + + Annotations: + rdfs:label "exchange rate" + + SubClassOf: + + + +Class: OEO_00020115 + + Annotations: + "Purchasing power parity is a ratio between currencies that equalises differences in monetary price levels between countries for the same set of goods should be sufficient.", + "PPP", + "https://github.com/OpenEnergyPlatform/ontology/issues/867 +https://github.com/OpenEnergyPlatform/ontology/pull/910", + "https://www.oecd.org/sdd/prices-ppp/purchasingpowerparities-frequentlyaskedquestionsfaqs.htm#FAQ1", + rdfs:label "purchasing power parity" + + SubClassOf: + + + Class: OEO_00030016 Annotations: @@ -965,7 +1003,9 @@ Class: OEO_00040004 "A unit which is a measure of the medium of an exchange value, defined by reference to the geographical location of the monetary authorities responsible for it.", "fibo-fnd-acc-cur:Currency", "https://github.com/OpenEnergyPlatform/ontology/issues/331 -https://github.com/OpenEnergyPlatform/ontology/pull/640", +https://github.com/OpenEnergyPlatform/ontology/pull/640 +add comment and example +https://github.com/OpenEnergyPlatform/ontology/pull/910", rdfs:comment "Currency is the unit of monetary value as defined by each country.", rdfs:label "currency"@en, rdfs:seeAlso "https://spec.edmcouncil.org/fibo/ontology/FND/Accounting/CurrencyAmount/Currency" From 6feb2c5c3f56eb560d48f5e6dad91bfb4fab274e Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 18 Oct 2021 15:21:25 +0200 Subject: [PATCH 3/9] add inflation rate, exchange rate and system cost #335 --- src/ontology/edits/oeo-social.omn | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index c91790986..9e2400c29 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -870,6 +870,9 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/909", Class: OEO_00020113 Annotations: + "Inflation rate is a ratio between the monetary price for a good/commodity at two different points in time that equalises differences in monetary price levels between these two points in time.", + "https://github.com/OpenEnergyPlatform/ontology/issues/335 +https://github.com/OpenEnergyPlatform/ontology/pull/910", rdfs:label "inflation rate" SubClassOf: @@ -879,6 +882,12 @@ Class: OEO_00020113 Class: OEO_00020114 Annotations: + "The exchange rate between USD and EUR on March 15, 2020 was X.X.", + "The exchange rate is a ratio at which one currency can be exchanged for another.", + "market exchange rate", + "https://github.com/OpenEnergyPlatform/ontology/issues/335 +https://github.com/OpenEnergyPlatform/ontology/pull/910", + rdfs:comment "The ratio at which one can exchange one currency for another can differ over time therefore it is necessary to specify a time point when referring to an exchange rate.", rdfs:label "exchange rate" SubClassOf: @@ -899,6 +908,18 @@ https://github.com/OpenEnergyPlatform/ontology/pull/910", +Class: OEO_00020116 + + Annotations: + "System cost are total costs of a system.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/335 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/910", + rdfs:label "system cost" + + SubClassOf: + OEO_00040009 + + Class: OEO_00030016 Annotations: From 02fb437c5cb2cc69944071bef58844f0d77a8e42 Mon Sep 17 00:00:00 2001 From: stap-m Date: Mon, 18 Oct 2021 15:27:19 +0200 Subject: [PATCH 4/9] add electricity price #335 --- src/ontology/edits/oeo-social.omn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index 9e2400c29..730003494 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -920,6 +920,20 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/910", OEO_00040009 +Class: OEO_00020117 + + Annotations: + "the current monetary price for electricity is Y EUR per megawatt-hour.", + "Electricity price is the monetary price per energy unit of electricity.", + "issue: https://github.com/OpenEnergyPlatform/ontology/issues/335 +pull request: https://github.com/OpenEnergyPlatform/ontology/pull/910", + rdfs:comment "has unit some \"currency per energy unit\"", + rdfs:label "electricity price" + + SubClassOf: + OEO_00040003 + + Class: OEO_00030016 Annotations: From 10618dcad853f89978002c5b83982752f77d1abd Mon Sep 17 00:00:00 2001 From: stap-m Date: Tue, 19 Oct 2021 09:24:29 +0200 Subject: [PATCH 5/9] change parent classes, add axiom, changelog #335 --- CHANGELOG.md | 2 ++ src/ontology/edits/oeo-social.omn | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a4871a6b..3b97732e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,9 +21,11 @@ Here is a template for new release sections - energy transformation unit, energy transfer (#895) - outage and subclasses, curtailment (#897) - levy, tax, feed in tariff, market and capacity premium (#909) +- inflation rate, exchange rate, purchasing power parity, electricity price, system cost (#910) ### Changed - energy converting device / component, unit of measurement (#895) +- currency (#910) ### Removed diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index 730003494..7c52a2d62 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -321,6 +321,9 @@ Class: Class: +Class: + + Class: OEO_00000045 Annotations: @@ -876,7 +879,8 @@ https://github.com/OpenEnergyPlatform/ontology/pull/910", rdfs:label "inflation rate" SubClassOf: - + OEO_00140012, + OEO_00040010 some Class: OEO_00020114 @@ -891,7 +895,8 @@ https://github.com/OpenEnergyPlatform/ontology/pull/910", rdfs:label "exchange rate" SubClassOf: - + OEO_00140012, + OEO_00040010 some Class: OEO_00020115 @@ -905,7 +910,8 @@ https://github.com/OpenEnergyPlatform/ontology/pull/910", rdfs:label "purchasing power parity" SubClassOf: - + OEO_00140012, + OEO_00040010 some Class: OEO_00020116 From a99e20c0dcbd1f58e93686ab9edf91a5c38027ee Mon Sep 17 00:00:00 2001 From: stap-m Date: Tue, 19 Oct 2021 10:01:12 +0200 Subject: [PATCH 6/9] adjust definitions #335 --- src/ontology/edits/oeo-social.omn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index 7c52a2d62..a395857ce 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -873,7 +873,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/909", Class: OEO_00020113 Annotations: - "Inflation rate is a ratio between the monetary price for a good/commodity at two different points in time that equalises differences in monetary price levels between these two points in time.", + "Inflation rate is an economic value reprensenting the ratio between the monetary price for a good/commodity at two different points in time that equalises differences in monetary price levels between these two points in time.", "https://github.com/OpenEnergyPlatform/ontology/issues/335 https://github.com/OpenEnergyPlatform/ontology/pull/910", rdfs:label "inflation rate" @@ -887,7 +887,7 @@ Class: OEO_00020114 Annotations: "The exchange rate between USD and EUR on March 15, 2020 was X.X.", - "The exchange rate is a ratio at which one currency can be exchanged for another.", + "The exchange rate is an economic value representing the ratio at which one currency can be exchanged for another.", "market exchange rate", "https://github.com/OpenEnergyPlatform/ontology/issues/335 https://github.com/OpenEnergyPlatform/ontology/pull/910", @@ -902,7 +902,7 @@ https://github.com/OpenEnergyPlatform/ontology/pull/910", Class: OEO_00020115 Annotations: - "Purchasing power parity is a ratio between currencies that equalises differences in monetary price levels between countries for the same set of goods should be sufficient.", + "Purchasing power parity is an economic value reprensenting the ratio between currencies that equalises differences in monetary price levels between countries for the same set of goods should be sufficient.", "PPP", "https://github.com/OpenEnergyPlatform/ontology/issues/867 https://github.com/OpenEnergyPlatform/ontology/pull/910", From 4509e1cfdfc3c4a4de475df3469f64d16b33a19b Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Tue, 19 Oct 2021 20:01:17 +0200 Subject: [PATCH 7/9] Update src/ontology/edits/oeo-social.omn Co-authored-by: l-emele <36884905+l-emele@users.noreply.github.com> --- src/ontology/edits/oeo-social.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index a395857ce..eb9d9e473 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -873,7 +873,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/909", Class: OEO_00020113 Annotations: - "Inflation rate is an economic value reprensenting the ratio between the monetary price for a good/commodity at two different points in time that equalises differences in monetary price levels between these two points in time.", + "Inflation rate is an economic value reprensenting the ratio between the monetary price for a good at two different points in time that equalises differences in monetary price levels between these two points in time.", "https://github.com/OpenEnergyPlatform/ontology/issues/335 https://github.com/OpenEnergyPlatform/ontology/pull/910", rdfs:label "inflation rate" From bc7d2dd4fef8f211410ad3a6714cbb3ca715acc9 Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Tue, 19 Oct 2021 20:01:44 +0200 Subject: [PATCH 8/9] Update src/ontology/edits/oeo-social.omn Co-authored-by: l-emele <36884905+l-emele@users.noreply.github.com> --- src/ontology/edits/oeo-social.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index eb9d9e473..a87bfbdd0 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -902,7 +902,7 @@ https://github.com/OpenEnergyPlatform/ontology/pull/910", Class: OEO_00020115 Annotations: - "Purchasing power parity is an economic value reprensenting the ratio between currencies that equalises differences in monetary price levels between countries for the same set of goods should be sufficient.", + "Purchasing power parity is an economic value reprensenting the ratio between currencies that equalises differences in monetary price levels between countries for the same set of goods.", "PPP", "https://github.com/OpenEnergyPlatform/ontology/issues/867 https://github.com/OpenEnergyPlatform/ontology/pull/910", From 6ad10a9564a5107a7a5550b7a6e3845aeaa6ddaa Mon Sep 17 00:00:00 2001 From: stap-m <38690039+stap-m@users.noreply.github.com> Date: Tue, 19 Oct 2021 20:02:10 +0200 Subject: [PATCH 9/9] Update src/ontology/edits/oeo-social.omn Co-authored-by: l-emele <36884905+l-emele@users.noreply.github.com> --- src/ontology/edits/oeo-social.omn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn index a87bfbdd0..c50ee21dd 100644 --- a/src/ontology/edits/oeo-social.omn +++ b/src/ontology/edits/oeo-social.omn @@ -929,7 +929,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/910", Class: OEO_00020117 Annotations: - "the current monetary price for electricity is Y EUR per megawatt-hour.", + "The electricity price is Y EUR per megawatt-hour.", "Electricity price is the monetary price per energy unit of electricity.", "issue: https://github.com/OpenEnergyPlatform/ontology/issues/335 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/910",