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.

Sign up for GitHub

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

Jump to bottom

Introduce sector module #1724

Merged
merged 64 commits into from
Oct 23, 2023
Merged

Introduce sector module #1724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
f01429d
add new sector module as copy of oeo-social #1399
stap-m Oct 16, 2023
c925897
Revert "add new sector module as copy of oeo-social #1399"
stap-m Oct 17, 2023
1e391f7
add new sector module #1399
stap-m Oct 17, 2023
bbbf641
reset new module #1399
stap-m Oct 17, 2023
d6981d3
Update src/ontology/edits/oeo-social.omn
stap-m Oct 17, 2023
fd44806
Update src/ontology/edits/oeo-social.omn
stap-m Oct 17, 2023
05786fe
Update src/ontology/edits/oeo-social.omn
stap-m Oct 17, 2023
06e7b94
add prefixes, annotation properties, description
stap-m Oct 17, 2023
05753a4
import oeo-shared
stap-m Oct 17, 2023
f5f6f26
import oeo-sector into oeo-shared-axioms
stap-m Oct 17, 2023
098f3c9
modify prefix
stap-m Oct 17, 2023
87102b5
Update src/ontology/edits/catalog-v001.xml
stap-m Oct 17, 2023
a1cec31
copy oeo-social into oeo-sector #1399
stap-m Oct 20, 2023
97a080e
remove dublicate and non-sector-related classes from oeo-sector #1399
stap-m Oct 20, 2023
b75a722
remove more dublicate and non-sector-related classes from oeo-sector …
stap-m Oct 20, 2023
3d25a69
Fix usage of catalog in Makefile
MGlauer Oct 20, 2023
a2e7daa
remove dublicate sector-related individuals from oeo-social #1399
stap-m Oct 20, 2023
7c31d6a
remove dublicate sector-related classes from oeo-social #1399
stap-m Oct 20, 2023
9d292f0
Add sectors.omn to main catalog
MGlauer Oct 20, 2023
e5d9f81
Merge pull request #1729 from OpenEnergyPlatform/fix-1724-sectors-in-…
stap-m Oct 20, 2023
ccdc3cf
Merge branch 'feature-1399-introduce-sector-module' of https://github…
stap-m Oct 20, 2023
883f714
remove covers sector from oeo-social #1399
stap-m Oct 20, 2023
3963430
remove is sector of from oeo-social #1399
stap-m Oct 20, 2023
66181e8
remove class declaration remainders from oeo-social #1399
stap-m Oct 20, 2023
8e83d7b
remove more class declaration remainders from oeo-social #1399
stap-m Oct 20, 2023
075e36a
remove class declaration remainders from oeo-sector #1399
stap-m Oct 20, 2023
ecc39f0
remove more class declaration remainders from oeo-sector #1399
stap-m Oct 20, 2023
3b9fde4
remove some more class declaration remainders from oeo-sector #1399
stap-m Oct 20, 2023
6cabb31
remove even more class declaration remainders from oeo-sector #1399
stap-m Oct 20, 2023
cf8bc9b
remove 17 more class declaration remainders from oeo-sector #1399
stap-m Oct 20, 2023
6ad976e
remove again more class declaration remainders from oeo-sector #1399
stap-m Oct 20, 2023
c120149
remove range declaration of has client from oeo-sector #1399
stap-m Oct 20, 2023
f6288b6
remove range declaration of has organisation from oeo-sector #1399
stap-m Oct 20, 2023
aa0c62b
remove guides from oeo-sector #1399
stap-m Oct 20, 2023
3827d11
remove governs from oeo-sector #1399
stap-m Oct 20, 2023
8dac8b5
remove trades from oeo-sector #1399
stap-m Oct 20, 2023
e416027
remove is traded at from oeo-sector #1399
stap-m Oct 20, 2023
25c6554
move memo item to oeo-sector #1399
stap-m Oct 20, 2023
95db1e1
move has memo item to oeo-sector #1399
stap-m Oct 20, 2023
4f3dc75
remove more remaining empty class declarations oeo-sector #1399
stap-m Oct 20, 2023
f116df3
remove more remaining empty object property declarations oeo-sector #…
stap-m Oct 20, 2023
920c6ce
remove lasr remaining empty class declarations from oeo-model #1399
stap-m Oct 20, 2023
1376d9e
move axiom from EU climate policy to oeo-shared-axioms #1399
stap-m Oct 20, 2023
3966da9
... and add term tracker item #1399
stap-m Oct 20, 2023
289a836
remove sector disjointness from oeo-social #1399
stap-m Oct 20, 2023
f1184f9
remove last empty class declarations from oeo-social #1399
stap-m Oct 20, 2023
eba0e13
remove last empty object property declarations from oeo-social #1399
stap-m Oct 20, 2023
737c97b
remove empty individual declarations from oeo-shared #1399
stap-m Oct 20, 2023
4380e23
move remaining axiom to oeo-shared-axioms #1399
stap-m Oct 20, 2023
7c99c61
remove remaining empty individuals from oeo-sector #1399
stap-m Oct 20, 2023
54e1cad
remove remaining empty individuals from oeo-social #1399
stap-m Oct 20, 2023
7f23fba
remove more remaining empty individuals from oeo-social #1399
stap-m Oct 20, 2023
0fc58ea
remove more remaining empty individuals from oeo-social #1399
stap-m Oct 20, 2023
44800a0
remove disjointness of individuals from oeo-social #1399
stap-m Oct 20, 2023
a7c8693
move governs axioms from EU Transmission Trading System to oeo-shared…
stap-m Oct 20, 2023
ec3aafb
remove duplicate disjointness #1399
stap-m Oct 20, 2023
5c85194
remove last empty individuals from oeo-social #1399
stap-m Oct 20, 2023
151927e
add term tracker items to moved entities in oeo-sector #1399
stap-m Oct 20, 2023
314099e
add more term tracker items to moved entities in oeo-sector #1399
stap-m Oct 20, 2023
41a3c1f
add again term tracker items to moved entities in oeo-sector #1399
stap-m Oct 20, 2023
e7691af
add much more term tracker items to moved entities in oeo-sector #1399
stap-m Oct 20, 2023
bcf28f2
add final term tracker items to moved entities in oeo-sector #1399
stap-m Oct 20, 2023
9c15093
changelog #1399
stap-m Oct 20, 2023
14dd64a
Merge branch 'dev' into feature-1399-introduce-sector-module
stap-m Oct 20, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- energy balance -> energy balance data set (#1717)
- person, organisational role, organisation (#1716)
- state of matter (#1720)
- new module oeo-sectors (#1649)
- potential energy stroage function (#1728)

### Changed
Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ define replace_owls
endef

define translate_to_owl
$(ROBOT) convert --input $2 --output $1 --format owl
$(ROBOT) convert --catalog $(VERSIONDIR)/catalog-v001.xml --input $2 --output $1 --format owl
$(call replace_omns,$1)
$(call replace_devs,$1)
endef

define translate_to_omn
$(ROBOT) convert --input $2 --output $1 --format omn
$(ROBOT) convert --catalog $(VERSIONDIR)/catalog-v001.xml --input $2 --output $1 --format omn
$(call replace_owls,$1)
$(call replace_devs,$1)
endef
Expand All @@ -52,7 +52,7 @@ endef

all: base merge

base: | directories $(VERSIONDIR)/catalog-v001.xml build/robot.jar $(OMN_TRANSLATE) $(OWL_COPY) $(OMN_COPY)
base: | directories $(VERSIONDIR)/catalog-v001.xml build/robot.jar $(OWL_COPY) $(OMN_COPY) $(OMN_TRANSLATE)

merge: | $(VERSIONDIR)/oeo-full.omn

Expand All @@ -76,10 +76,10 @@ build/robot.jar: | build
curl -L -o $@ https://github.com/ontodev/robot/releases/download/v1.4.1/robot.jar


$(VERSIONDIR)/%.owl: $(ONTOLOGY_SOURCE)/%.omn
$(VERSIONDIR)/%.owl: $(VERSIONDIR)/%.omn
$(call translate_to_owl,$@,$<)

$(VERSIONDIR)/modules/%.owl: $(ONTOLOGY_SOURCE)/edits/%.omn
$(VERSIONDIR)/modules/%.owl: $(VERSIONDIR)/edits/%.omn
$(call translate_to_owl,$@,$<)

$(VERSIONDIR)/%.owl: $(ONTOLOGY_SOURCE)/%.owl
Expand Down
1 change: 1 addition & 0 deletions src/ontology/catalog-v001.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<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-shared-axioms.omn" uri="edits/oeo-shared-axioms.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-import-edits.owl" uri="edits/oeo-import-edits.owl"/>
<uri id="User Entered Import Resolution" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical-axioms.omn" uri="edits/oeo-physical-axioms.owl"/>
Expand Down
1 change: 1 addition & 0 deletions src/ontology/edits/catalog-v001.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-sector.omn" uri="oeo-sector.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-social.omn" uri="oeo-social.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-model.omn" uri="oeo-model.omn"/>
<uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical.omn" uri="oeo-physical.omn"/>
Expand Down
3 changes: 0 additions & 3 deletions src/ontology/edits/oeo-model.omn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,9 +1217,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/584",
<http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00000364


Class: OEO_00000367


Class: OEO_00000370

Annotations:
Expand Down
Loading
Loading