1430: Remove non simple property restrictions

.github/workflows/automated-testing.yml

@@ -32,4 +32,11 @@ jobs:
       - name: competency
         run: |
           bash tests/competency_questions/run_questions.sh "java -jar build/hermit.jar" $(pwd)/build/oeo/$(cat VERSION)/oeo-full.owl true
-          bash tests/competency_questions/run_questions.sh "java -jar build/hermit.jar" $(pwd)/build/oeo/$(cat VERSION)/oeo-full.owl false
+          bash tests/competency_questions/run_questions.sh "java -jar build/hermit.jar" $(pwd)/build/oeo/$(cat VERSION)/oeo-full.owl false
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-files
+          path: |
+            build/**/*
+            !build/**/*.jar

CHANGELOG.md

@@ -15,6 +15,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 
 ### Changed
 - NC/BR sector division and sector individuals; KSG sector division;  EU sectors/divisions; EU climate policy (#1462)
+- electricity grid (#1479)
 - air (#1499)
 - storage capacity -> energy storage capacity (#1486)
 

Makefile

@@ -28,6 +28,12 @@ endef
 
 define replace_oms
 	sed -i -E "s/($(OEP_BASE)\/dev\/([a-zA-Z/\-]+)\.)omn/\1owl/m" $1
+	sed -i -E "s/($(OEP_BASE)\/releases\/$(VERSION)\/([a-zA-Z/\-]+)\.)omn/\1owl/m" $1
+endef
+
+define replace_owls
+	sed -i -E "s/($(OEP_BASE)\/dev\/([a-zA-Z/\-]+)\.)owl/\1omn/m" $1
+	sed -i -E "s/($(OEP_BASE)\/releases\/$(VERSION)\/([a-zA-Z/\-]+)\.)owl/\1omn/m" $1
 endef
 
 define translate_to_owl
@@ -36,13 +42,19 @@ define translate_to_owl
 	$(call replace_devs,$1)
 endef
 
+define translate_to_omn
+	$(ROBOT) convert --input $2 --output $1 --format omn
+	$(call replace_owls,$1)
+	$(call replace_devs,$1)
+endef
+
 .PHONY: all clean base merge directories
 
 all: base merge
 
 base: | directories $(VERSIONDIR)/catalog-v001.xml build/robot.jar $(OMN_TRANSLATE) $(OWL_COPY) $(OMN_COPY)
 
-merge: | $(VERSIONDIR)/oeo-full.owl
+merge: | $(VERSIONDIR)/oeo-full.omn
 
 clean:
 	- $(RM) -r $(VERSIONDIR) $(ROBOT_PATH)
@@ -86,9 +98,10 @@ $(VERSIONDIR)/%.omn: $(ONTOLOGY_SOURCE)/%.omn
 	cp -a $< $@
 	$(call replace_devs,$@)
 
-$(VERSIONDIR)/oeo-full.omn : | base
-	$(ROBOT) merge --catalog $(VERSIONDIR)/catalog-v001.xml $(foreach f, $(VERSIONDIR)/oeo.omn $(OMN_COPY) $(OWL_COPY), --input $(f)) annotate --ontology-iri http://openenergy-platform.org/ontology/oeo/ --output $@
+$(VERSIONDIR)/oeo-full.owl : | base
+	$(ROBOT) merge --catalog $(VERSIONDIR)/catalog-v001.xml $(foreach f, $(VERSIONDIR)/oeo.owl $(OMN_COPY) $(OWL_COPY), --input $(f)) annotate --ontology-iri http://openenergy-platform.org/ontology/oeo/ --output $@
+	$(call replace_oms,$@)
 
-$(VERSIONDIR)/oeo-full.owl : $(VERSIONDIR)/oeo-full.omn
-	$(call translate_to_owl,$@,$<)
-	$(call replace_omns,$@)
+$(VERSIONDIR)/oeo-full.omn : $(VERSIONDIR)/oeo-full.owl
+	$(call translate_to_omn,$@,$<)
+	$(call replace_owls,$@)

src/ontology/edits/oeo-shared.omn

@@ -1689,13 +1689,19 @@ Class: OEO_00000143
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/165
 
 Move to oeo-shared:
-https://github.com/OpenEnergyPlatform/ontology/pull/1360",
+https://github.com/OpenEnergyPlatform/ontology/pull/1360
+
+updated part relation between electricity grid and power line to have simple restrictions:
+
+replace min 1 restriction by some restriction
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1430
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1479",
         rdfs:label "electricity grid"
 
     SubClassOf: 
         OEO_00000200,
         <http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00000144,
-        <http://purl.obolibrary.org/obo/BFO_0000051> min 1 OEO_00000253
+        <http://purl.obolibrary.org/obo/BFO_0000051> some OEO_00000253
 
 
 Class: OEO_00000144