Merge pull request #273 from OpenEnergyPlatform/feature/Generator-#173

restructure Generator and ArtificialObject classes
OpenEnergyPlatform · Mar 31, 2020 · d36ecd2 · d36ecd2
2 parents a895470 + 90424a1
commit d36ecd2
Show file tree

Hide file tree

Showing 4 changed files with 368 additions and 391 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -56,6 +56,7 @@ Here is a template for new release sections
 - unify -Energy and -Power classes (#225)
 - ModelElement and subbclasses
 - update issue templates 'workflow checklist' (#258)
+- Generator (#273)
 - EnergyStorage (#276)
 
 

diff --git a/src/ontology/catalog-v001.xml b/src/ontology/catalog-v001.xml
@@ -11,5 +11,6 @@
         <uri id="Automatically generated entry, Timestamp=1583227122675" name="http://open-energy-ontology.org/ontology/imports/iao-module.owl" uri="imports/iao-module.owl"/>
         <uri id="Automatically generated entry, Timestamp=1583227122675" name="http://open-energy-ontology.org/ontology/imports/ro-module.owl" uri="imports/ro-module.owl"/>
         <uri id="Automatically generated entry, Timestamp=1583227122675" name="http://purl.obolibrary.org/obo/uo.owl" uri="imports/uo-module.owl"/>
+
     </group>
 </catalog>