Skip to content

Commit

Permalink
Merge pull request #1736 from OpenEnergyPlatform/releases-v2.0.0
Browse files Browse the repository at this point in the history
Releases v2.0.0 to dev
  • Loading branch information
l-emele authored Oct 25, 2023
2 parents 6008823 + 76581b1 commit 52edc58
Show file tree
Hide file tree
Showing 10 changed files with 741 additions and 734 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,19 @@ All notable changes to this project will be documented in this file.
The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.X.X] - 20XX-XX-XX
## [2.0.0] - 2023-10-25

### Major stuctural changes
For the version 2.0.0 we especially did some major structural changes on the OEO. Two new modules were introduced:
* The first one, oeo-sector, is a module on the same hierarchical level as the other content-related modules, i.e. oeo-physical, oeo-model and oeo-social. All sector-related entities were moved there from oeo-social.
* The second one, oeo-shared-axioms, is a module that imports the four content-related modules and contains all axioms that are introduced across modules.

This caused a lot of movement of entities, especially from oeo-shared. Many classes were moved back to their original module. This restructuring was done to foster the modularity, which makes the implementation easier and more error-prone. Yet, we had to break with the rule, that all axioms should live in the same module as their class of declaration. The full axiomatisation of a class is now only provided if the module oeo-shared-axioms is used. See also the wiki article on the [modules of the OEO](https://github.com/OpenEnergyPlatform/ontology/wiki/Modules-of-the-OEO).

Further, the import process for UO and OMO were updated. All scripts and tools not essential for the building routine moved to a [seperate repository](https://github.com/OpenEnergyPlatform/oeo-tools). And finally, english language labels were added to (english) definitions and labels, to allow other language extentions in the future.

### Content-related changes
We added a lot of classes that are relevant for the OEKG development, i.e. technologies (#1572) and descriptors for scenario studies (https://github.com/OpenEnergyPlatform/oekg/issues/19).

### Added
- heat generation technology, solar heat technology, geothermal heat technology (#1610)
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ authors:
title: "Open Energy Ontology (OEO)"
type: software
license: CC0-1.0
version: 1.16.1
version: 2.0.0
doi:
date-released: 2023-08-01
date-released: 2023-10-25
url: "https://github.com/OpenEnergyPlatform/ontology"
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.1
2.0.0
1 change: 1 addition & 0 deletions src/ontology/catalog-v001.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/" uri="oeo.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical.omn" uri="edits/oeo-physical.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical-axioms.owl" uri="edits/oeo-physical-axioms.owl"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-sector.omn" uri="edits/oeo-sector.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-social.omn" uri="edits/oeo-social.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-model.omn" uri="edits/oeo-model.omn"/>
Expand Down
320 changes: 160 additions & 160 deletions src/ontology/edits/oeo-model.omn

Large diffs are not rendered by default.

798 changes: 399 additions & 399 deletions src/ontology/edits/oeo-physical.omn

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions src/ontology/edits/oeo-sector.omn

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions src/ontology/edits/oeo-shared-axioms.omn
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ AnnotationProperty: <http://www.geneontology.org/formats/oboInOwl#hasExactSynony

AnnotationProperty: OEO_00110012

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A mathematical expression is an annotation property that describes the class with a mathematical formula in LaTeX syntax."@en,
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/987
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/990"@en,
rdfs:label "mathematical expression"@en


AnnotationProperty: dc:description

Expand Down
88 changes: 44 additions & 44 deletions src/ontology/edits/oeo-shared.omn

Large diffs are not rendered by default.

132 changes: 66 additions & 66 deletions src/ontology/edits/oeo-social.omn

Large diffs are not rendered by default.

0 comments on commit 52edc58

Please sign in to comment.