Merge pull request #800 from OpenEnergyPlatform/feature-256-market-re…

…lated-terms add last market related terms #256
OpenEnergyPlatform · Jul 16, 2021 · 6f1bf97 · 6f1bf97
2 parents 714ac3a + ccc9394
commit 6f1bf97
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ Here is a template for new release sections
 - power plant portfolio, dispatch assignment (#792)
 - yield profile, demand trader, direct marketer, merit order, full load hours (#793)
 - energy demand (#796)
+- markup, markdown #800
 
 ### Changed
 ### Removed

diff --git a/src/ontology/edits/oeo-shared.omn b/src/ontology/edits/oeo-shared.omn
@@ -397,7 +397,9 @@ Class: OEO_00020067
     Annotations: 
         <http://purl.obolibrary.org/obo/IAO_0000115> "A commodity is a material entity that bears the commodity role.",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/302
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/748",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/748
+add alternative term
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/800",
         rdfs:label "commodity"
 
     EquivalentTo: 

diff --git a/src/ontology/edits/oeo-social.omn b/src/ontology/edits/oeo-social.omn
@@ -732,6 +732,9 @@ Class: OEO_00020066
 
 Class: OEO_00020067
 
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000118> "product"
+
     SubClassOf: 
         OEO_00020070 some OEO_00020069
 
@@ -769,6 +772,32 @@ pull request https://github.com/OpenEnergyPlatform/ontology/pull/781",
         OEO_00020071 some OEO_00020063
 
 
+Class: OEO_00020076
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A markup is an economic value that indicates a virtual amount added to an assumed or historical price to predict a price in a different context.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "https://github.com/OpenEnergyPlatform/ontology/issues/256
+https://github.com/OpenEnergyPlatform/ontology/pull/800",
+        rdfs:label "markup"
+
+    SubClassOf: 
+        OEO_00140012,
+        OEO_00040010 some OEO_00040004
+
+
+Class: OEO_00020077
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A markdown is an economic value that indicates a virtual amount deducted from an assumed or historical price to predict a price in a different context.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "https://github.com/OpenEnergyPlatform/ontology/issues/256
+https://github.com/OpenEnergyPlatform/ontology/pull/800",
+        rdfs:label "markdown"
+
+    SubClassOf: 
+        OEO_00140012,
+        OEO_00040010 some OEO_00040004
+
+
 Class: OEO_00030016
 
     Annotations: