Skip to content

Commit 08b3d65

Browse files
updated ontology
1 parent 50fc539 commit 08b3d65

6 files changed

Lines changed: 53 additions & 21 deletions

File tree

src/ontology/Makefile

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# More information: https://github.com/INCATools/ontology-development-kit/
1111

1212
# Fingerprint of the configuration file when this Makefile was last generated
13-
CONFIG_HASH= c8acffb99071c1fe7ff7974c8a9b0709f90e3c09dbfe5e7a00bdb783f9747df3
13+
CONFIG_HASH= 495b815776e4285522f4de7f94d5ccfbbdb169a63a8896972c6d02ec271da177
1414

1515

1616
# ----------------------------------------
@@ -57,7 +57,7 @@ OBODATE ?= $(shell date +'%d:%m:%Y %H:%M')
5757
VERSION= $(TODAY)
5858
ANNOTATE_ONTOLOGY_VERSION = annotate -V $(ONTBASE)/releases/$(VERSION)/$@ --annotation owl:versionInfo $(VERSION)
5959
ANNOTATE_CONVERT_FILE = annotate --ontology-iri $(ONTBASE)/$@ $(ANNOTATE_ONTOLOGY_VERSION) convert -f ofn --output $@.tmp.owl && mv $@.tmp.owl $@
60-
OTHER_SRC = $(COMPONENTSDIR)/imports-edit.owl $(COMPONENTSDIR)/microstructure-axioms-shared.owl $(COMPONENTSDIR)/microstructure-characterization.owl $(COMPONENTSDIR)/microstructure-manufacturing.owl $(COMPONENTSDIR)/microstructure-materials.owl $(COMPONENTSDIR)/microstructure-texture.owl $(COMPONENTSDIR)/microstructure-shared.owl
60+
OTHER_SRC = $(COMPONENTSDIR)/imports-edit.owl $(COMPONENTSDIR)/microstructure-shared.owl $(COMPONENTSDIR)/microstructure-axioms-shared.owl $(COMPONENTSDIR)/microstructure-microscopy.owl $(COMPONENTSDIR)/microstructure-defects.owl $(COMPONENTSDIR)/microstructure-damage.owl $(COMPONENTSDIR)/microstructure-phases.owl
6161
ONTOLOGYTERMS = $(TMPDIR)/ontologyterms.txt
6262
EDIT_PREPROCESSED = $(TMPDIR)/$(ONT)-preprocess.owl
6363

@@ -387,7 +387,7 @@ $(IMPORTSEED): $(PRESEED) | $(TMPDIR)
387387

388388
T_IMPORTSEED = --term-file $(IMPORTSEED)
389389

390-
ANNOTATION_PROPERTIES=rdfs:label skos:definition skos:example skos:comment skos:altLabel
390+
ANNOTATION_PROPERTIES=rdfs:label IAO:0000115 OMO:0002000
391391

392392
# ----------------------------------------
393393
# Import modules
@@ -423,7 +423,6 @@ $(IMPORTDIR)/pmdco_import.owl: $(MIRRORDIR)/pmdco.owl
423423
@echo " This rule needs to be overwritten in microstructure.Makefile!"
424424
@false
425425

426-
427426
## Module for ontology: uo (custom)
428427
$(IMPORTDIR)/uo_import.owl: $(MIRRORDIR)/uo.owl
429428
@echo "ERROR: You have configured uo as a custom module;"
@@ -480,23 +479,23 @@ all_components: $(OTHER_SRC)
480479
.PHONY: recreate-components
481480
recreate-components:
482481
$(MAKE) --assume-new=$(TMPDIR)/stamp-component-imports-edit.owl \
483-
--assume-new=$(TMPDIR)/stamp-component-microstructure-axioms-shared.owl \
484-
--assume-new=$(TMPDIR)/stamp-component-microstructure-characterization.owl \
485-
--assume-new=$(TMPDIR)/stamp-component-microstructure-manufacturing.owl \
486-
--assume-new=$(TMPDIR)/stamp-component-microstructure-materials.owl \
487-
--assume-new=$(TMPDIR)/stamp-component-microstructure-texture.owl \
488482
--assume-new=$(TMPDIR)/stamp-component-microstructure-shared.owl \
483+
--assume-new=$(TMPDIR)/stamp-component-microstructure-axioms-shared.owl \
484+
--assume-new=$(TMPDIR)/stamp-component-microstructure-microscopy.owl \
485+
--assume-new=$(TMPDIR)/stamp-component-microstructure-defects.owl \
486+
--assume-new=$(TMPDIR)/stamp-component-microstructure-damage.owl \
487+
--assume-new=$(TMPDIR)/stamp-component-microstructure-phases.owl \
489488
COMP=true IMP=false MIR=true PAT=true all_components
490489

491490
.PHONY: no-mirror-recreate-components
492491
no-mirror-recreate-components:
493492
$(MAKE) --assume-new=$(TMPDIR)/stamp-component-imports-edit.owl \
494-
--assume-new=$(TMPDIR)/stamp-component-microstructure-axioms-shared.owl \
495-
--assume-new=$(TMPDIR)/stamp-component-microstructure-characterization.owl \
496-
--assume-new=$(TMPDIR)/stamp-component-microstructure-manufacturing.owl \
497-
--assume-new=$(TMPDIR)/stamp-component-microstructure-materials.owl \
498-
--assume-new=$(TMPDIR)/stamp-component-microstructure-texture.owl \
499493
--assume-new=$(TMPDIR)/stamp-component-microstructure-shared.owl \
494+
--assume-new=$(TMPDIR)/stamp-component-microstructure-axioms-shared.owl \
495+
--assume-new=$(TMPDIR)/stamp-component-microstructure-microscopy.owl \
496+
--assume-new=$(TMPDIR)/stamp-component-microstructure-defects.owl \
497+
--assume-new=$(TMPDIR)/stamp-component-microstructure-damage.owl \
498+
--assume-new=$(TMPDIR)/stamp-component-microstructure-phases.owl \
500499
COMP=true IMP=false MIR=false PAT=true all_components
501500

502501
.PHONY: recreate-%
@@ -529,7 +528,7 @@ ifeq ($(MIR),true)
529528
.PHONY: mirror-pmdco
530529
.PRECIOUS: $(MIRRORDIR)/pmdco.owl
531530
mirror-pmdco: | $(TMPDIR)
532-
$(ROBOT) convert -I https://materialdigital.github.io/core-ontology/ontology.owl -o $(TMPDIR)/$@.owl
531+
$(ROBOT) convert -I https://raw.githubusercontent.com/materialdigital/core-ontology/refs/heads/main/pmdco-full.owl -o $(TMPDIR)/$@.owl
533532

534533

535534
## ONTOLOGY: uo
@@ -723,8 +722,6 @@ update_repo:
723722
odk.py update
724723

725724

726-
update_docs:
727-
mkdocs gh-deploy --config-file ../../mkdocs.yaml
728725

729726
# Note to future generations: computing the real path relative to the
730727
# current directory is a way to ensure we only clean up directories that

src/ontology/catalog-v001.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
33
<group id="odk-managed-catalog" prefer="public">
44
<uri name="https://w3id.org/pmd/microstructure/imports/pmdco_import.owl" uri="imports/pmdco_import.owl" />
5+
<uri name="https://w3id.org/pmd/microstructure/imports/uo_import.owl" uri="imports/uo_import.owl" />
56
<uri name="https://w3id.org/pmd/microstructure/imports/cryo_import.owl" uri="imports/cryo_import.owl" />
67
<uri name="https://w3id.org/pmd/microstructure/imports/qudt_import.owl" uri="imports/qudt_import.owl" />
7-
<uri name="https://w3id.org/pmd/microstructure/imports/uo_import.owl" uri="imports/uo_import.owl" />
88
<uri name="https://w3id.org/pmd/microstructure/components/imports-edit.owl" uri="components/imports-edit.owl" />
99
<uri name="https://w3id.org/pmd/microstructure/components/microstructure-shared.owl" uri="components/microstructure-shared.owl" />
1010
<uri name="https://w3id.org/pmd/microstructure/components/microstructure-axioms-shared.owl" uri="components/microstructure-axioms-shared.owl" />
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Prefix(:=<https://w3id.org/pmd/microstructure/imports/cryo_import.owl>)
2+
Prefix(obo:=<http://purl.obolibrary.org/obo/>)
3+
Prefix(owl:=<http://www.w3.org/2002/07/owl#>)
4+
Prefix(rdf:=<http://www.w3.org/1999/02/22-rdf-syntax-ns#>)
5+
Prefix(xml:=<http://www.w3.org/XML/1998/namespace>)
6+
Prefix(xsd:=<http://www.w3.org/2001/XMLSchema#>)
7+
Prefix(rdfs:=<http://www.w3.org/2000/01/rdf-schema#>)
8+
Prefix(oboInOwl:=<http://www.geneontology.org/formats/oboInOwl#>)
9+
10+
Ontology(<https://w3id.org/pmd/microstructure/imports/cryo_import.owl>
11+
# This is a placeholder, it will be regenerated when makefile is first executed.
12+
)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Prefix(:=<https://w3id.org/pmd/microstructure/imports/qudt_import.owl>)
2+
Prefix(obo:=<http://purl.obolibrary.org/obo/>)
3+
Prefix(owl:=<http://www.w3.org/2002/07/owl#>)
4+
Prefix(rdf:=<http://www.w3.org/1999/02/22-rdf-syntax-ns#>)
5+
Prefix(xml:=<http://www.w3.org/XML/1998/namespace>)
6+
Prefix(xsd:=<http://www.w3.org/2001/XMLSchema#>)
7+
Prefix(rdfs:=<http://www.w3.org/2000/01/rdf-schema#>)
8+
Prefix(oboInOwl:=<http://www.geneontology.org/formats/oboInOwl#>)
9+
10+
Ontology(<https://w3id.org/pmd/microstructure/imports/qudt_import.owl>
11+
# This is a placeholder, it will be regenerated when makefile is first executed.
12+
)

src/ontology/imports/uo_import.owl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Prefix(:=<https://w3id.org/pmd/microstructure/imports/uo_import.owl>)
2+
Prefix(obo:=<http://purl.obolibrary.org/obo/>)
3+
Prefix(owl:=<http://www.w3.org/2002/07/owl#>)
4+
Prefix(rdf:=<http://www.w3.org/1999/02/22-rdf-syntax-ns#>)
5+
Prefix(xml:=<http://www.w3.org/XML/1998/namespace>)
6+
Prefix(xsd:=<http://www.w3.org/2001/XMLSchema#>)
7+
Prefix(rdfs:=<http://www.w3.org/2000/01/rdf-schema#>)
8+
Prefix(oboInOwl:=<http://www.geneontology.org/formats/oboInOwl#>)
9+
10+
Ontology(<https://w3id.org/pmd/microstructure/imports/uo_import.owl>
11+
# This is a placeholder, it will be regenerated when makefile is first executed.
12+
)

src/ontology/microstructure-edit.owl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ Import(<https://w3id.org/pmd/microstructure/components/microstructure-defects.ow
1717
Import(<https://w3id.org/pmd/microstructure/components/microstructure-microscopy.owl>)
1818
Import(<https://w3id.org/pmd/microstructure/components/microstructure-phases.owl>)
1919
Import(<https://w3id.org/pmd/microstructure/components/microstructure-shared.owl>)
20-
Import(<https://w3id.org/pmd/microstructure/imports/pmdco_import.owl>)
2120
Import(<https://w3id.org/pmd/microstructure/imports/cryo_import.owl>)
22-
Import(<https://w3id.org/pmd/microstructure/imports/uo_import.owl>)
21+
Import(<https://w3id.org/pmd/microstructure/imports/pmdco_import.owl>)
2322
Import(<https://w3id.org/pmd/microstructure/imports/qudt_import.owl>)
24-
23+
Import(<https://w3id.org/pmd/microstructure/imports/uo_import.owl>)
2524
Annotation(dcterms:description "PMD Core application ontology generated via ODK Template.
2625
")
2726
Annotation(dcterms:license <https://w3id.org/pmd/microstructure.owl#CC-BY-4.0>)

0 commit comments

Comments
 (0)