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

1430: Remove non simple property restrictions #1479

Merged
merged 17 commits into from
Mar 9, 2023
Merged

1430: Remove non simple property restrictions #1479

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b3011bb
Inverted ontology compilation order
areleu Feb 7, 2023
ff18177
Added build files to testing artifacts
areleu Feb 8, 2023
61779b4
Removed .jars from artifacts
areleu Feb 8, 2023
0f2bb52
Properly replace omn with owl
areleu Feb 8, 2023
728ccf9
Updated CHANGELOG.md
areleu Feb 14, 2023
124d5fc
Removed non-simple property from electricity grid power line relation
areleu Feb 14, 2023
0af4332
Added changes to CHANGELOG
areleu Feb 14, 2023
8cf30fd
Updated term tracker item
areleu Feb 15, 2023
46b43d6
Adjusted changelog
areleu Feb 15, 2023
1c32350
Merge branch 'dev' into fix-1424-compile-owl-first
areleu Feb 22, 2023
67ab4c4
Merge branch 'fix-1424-compile-owl-first' into fix-1430-remove-non-si…
areleu Feb 23, 2023
a472d59
Added new line back
areleu Feb 23, 2023
c928367
Merge branch 'dev' into fix-1430-remove-non-simple-properties
stap-m Mar 1, 2023
b12cf63
Merge branch 'dev' into fix-1430-remove-non-simple-properties
stap-m Mar 9, 2023
9bf8b9b
Update CHANGELOG.md
areleu Mar 9, 2023
7bf6ffd
Update src/ontology/edits/oeo-shared.omn
areleu Mar 9, 2023
85d1327
Merge branch 'dev' into fix-1430-remove-non-simple-properties
stap-m Mar 9, 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
9 changes: 8 additions & 1 deletion .github/workflows/automated-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
## [1.X.X] - 20XX-XX-XX

### Added
- added built ontology to the pipeline artifacts.
### Changed
- changed order in which the oeo-full files are compiled, owl now builds before omn.
- updated part relation between electricity grid and power line to have simple restrictions.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here only the class electricity grid should be mentioned, without the details of the changes.

### Removed

## [1.13.0] - 2023-02-01
Expand Down
25 changes: 19 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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,$@)
4 changes: 2 additions & 2 deletions src/ontology/edits/oeo-shared.omn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ AnnotationProperty: dc:description


AnnotationProperty: dc:identifier


AnnotationProperty: rdfs:comment

Expand Down Expand Up @@ -1692,7 +1692,7 @@ https://github.com/OpenEnergyPlatform/ontology/pull/1360",
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
stap-m marked this conversation as resolved.
Show resolved Hide resolved


Class: OEO_00000144
Expand Down