Skip to content

Commit f5ab7b8

Browse files
joergwajoergwa
authored
Merge pull request #9 from materialdigital/release-preps
Release preps
2 parents 32430b7 + 443a7f2 commit f5ab7b8

9 files changed

Lines changed: 347 additions & 33 deletions

File tree

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ bin/
1818
/tto.obo
1919
/tto.json
2020
/tto.db
21+
/tto-base.*
22+
/tto-basic.*
23+
/tto-full.*
24+
/tto-simple.*
25+
/tto-simple-non-classified.*
2126
/mappings/
2227
/patterns/
2328
/reports/
@@ -70,3 +75,6 @@ docs/odk-workflows/RepositoryFileStructure.md
7075
/docs/odk-workflows
7176
/src/ontology/reports
7277
/src/ontology/tmp
78+
src/ontology/tmp/merged-tto-edit.ofn
79+
src/ontology/tmp/tto-preprocess.owl
80+
/src/ontology/tmp

‎src/ontology/Makefile‎

Lines changed: 29 additions & 3 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= d77eb61bd9c7297a6205cde171c4c0fb09911333d9ba28e1efe8d1f15001b298
13+
CONFIG_HASH= bb2f8a735b3caa7744c0e5024062bf5d7a0c187a3b19600be6beb77782c1eb90
1414

1515

1616
# ----------------------------------------
@@ -187,7 +187,7 @@ all_main: $(MAIN_FILES)
187187
# ----------------------------------------
188188

189189

190-
IMPORTS = pmdco
190+
IMPORTS = pmdco nfdicore
191191

192192
IMPORT_ROOTS = $(patsubst %, $(IMPORTDIR)/%_import, $(IMPORTS))
193193
IMPORT_OWL_FILES = $(foreach n,$(IMPORT_ROOTS), $(n).owl)
@@ -387,7 +387,7 @@ $(IMPORTSEED): $(PRESEED) | $(TMPDIR)
387387

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

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

392392
# ----------------------------------------
393393
# Import modules
@@ -426,6 +426,25 @@ $(IMPORTDIR)/pmdco_import.owl: $(MIRRORDIR)/pmdco.owl | all_robot_plugins
426426
repair --merge-axiom-annotations true \
427427
$(ANNOTATE_CONVERT_FILE)
428428

429+
## Module for ontology: nfdicore (slme)
430+
$(IMPORTDIR)/nfdicore_import.owl: $(MIRRORDIR)/nfdicore.owl $(IMPORTDIR)/nfdicore_terms.txt $(IMPORTSEED) | all_robot_plugins
431+
$(ROBOT) annotate --input $< --remove-annotations \
432+
odk:normalize --add-source true \
433+
extract --term-file $(IMPORTDIR)/nfdicore_terms.txt $(T_IMPORTSEED) \
434+
--copy-ontology-annotations true --force true \
435+
--individuals include \
436+
--method SUBSET \
437+
remove $(foreach p, $(ANNOTATION_PROPERTIES), --term $(p)) \
438+
--term rdfs:label \
439+
--term IAO:0000115 \
440+
--term OMO:0002000 \
441+
--term-file $(IMPORTDIR)/nfdicore_terms.txt $(T_IMPORTSEED) \
442+
--select complement --select annotation-properties \
443+
odk:normalize --base-iri https://w3id.org/pmd \
444+
--subset-decls true --synonym-decls true \
445+
repair --merge-axiom-annotations true \
446+
$(ANNOTATE_CONVERT_FILE)
447+
429448
endif # IMP=true
430449

431450
.PHONY: refresh-imports
@@ -466,6 +485,13 @@ mirror-pmdco: | $(TMPDIR)
466485
$(ROBOT) convert -I https://w3id.org/pmd/co/3.0.0-alpha4 -o $(TMPDIR)/$@.owl
467486

468487

488+
## ONTOLOGY: nfdicore
489+
.PHONY: mirror-nfdicore
490+
.PRECIOUS: $(MIRRORDIR)/nfdicore.owl
491+
mirror-nfdicore: | $(TMPDIR)
492+
$(ROBOT) convert -I https://nfdi.fiz-karlsruhe.de/ontology -o $(TMPDIR)/$@.owl
493+
494+
469495
$(MIRRORDIR)/%.owl: mirror-% | $(MIRRORDIR)
470496
if [ -f $(TMPDIR)/mirror-$*.owl ]; then if cmp -s $(TMPDIR)/mirror-$*.owl $@ ; then echo "Mirror identical, ignoring."; else echo "Mirrors different, updating." &&\
471497
cp $(TMPDIR)/mirror-$*.owl $@; fi; fi

‎src/ontology/catalog-v001.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
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/tto/imports/pmdco_import.owl" uri="imports/pmdco_import.owl" />
5+
<uri name="https://w3id.org/pmd/tto/imports/nfdicore_import.owl" uri="imports/nfdicore_import.owl" />
56
</group>
67
</catalog>

‎src/ontology/imports/nfdicore_import.owl‎

Lines changed: 264 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ontology/imports/nfdicore_terms.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
https://nfdi.fiz-karlsruhe.de/ontology/NFDI_0000139 # funding organization role
2+

‎src/ontology/imports/pmdco_import.owl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3590,7 +3590,7 @@ AnnotationAssertion(skos:definition co:PMD_0000056 "A melting furnace is a devic
35903590
AnnotationAssertion(skos:definition co:PMD_0000056 "Ein Schmelzofen ist ein Gerät, das eine Schmelzfunktion hat und in der Regel dazu dient, die Temperatur eines festen Materials zu erhöhen, um seine Umwandlung in eine Schmelze einzuleiten und aufrechtzuerhalten."@de)
35913591
SubClassOf(co:PMD_0000056 ObjectIntersectionOf(co:PMD_0000655 ObjectSomeValuesFrom(obo:RO_0000085 co:PMD_0000057)))
35923592

3593-
# Class: co:PMD_0000057 (Schmelzfunktion)
3593+
# Class: co:PMD_0000057 (melting function)
35943594

35953595
AnnotationAssertion(rdfs:label co:PMD_0000057 "Schmelzfunktion"@de)
35963596
AnnotationAssertion(rdfs:label co:PMD_0000057 "melting function"@en)
@@ -3919,7 +3919,7 @@ AnnotationAssertion(skos:definition co:PMD_0000541 "A CNC Machine is a Forming M
39193919
AnnotationAssertion(skos:definition co:PMD_0000541 "Eine CNC-Maschine ist eine Formmaschine, die zur präzisen Steuerung von Bearbeitungswerkzeugen für Schneid-, Bohr-, Fräs- und andere Aufgaben computergestützte numerische Steuerung verwendet."@de)
39203920
SubClassOf(co:PMD_0000541 co:PMD_0000648)
39213921

3922-
# Class: co:PMD_0000542 (cnc welding machine)
3922+
# Class: co:PMD_0000542 (CNC-Schweißmaschine)
39233923

39243924
AnnotationAssertion(rdfs:label co:PMD_0000542 "CNC-Schweißmaschine"@de)
39253925
AnnotationAssertion(rdfs:label co:PMD_0000542 "cnc welding machine"@en)
@@ -5521,7 +5521,7 @@ AnnotationAssertion(co:PMD_0000060 co:PMD_0000848 "true"^^xsd:boolean)
55215521
SubClassOf(co:PMD_0000848 co:PMD_0000005)
55225522
SubClassOf(co:PMD_0000848 ObjectSomeValuesFrom(co:PMD_0001030 co:PMD_0000522))
55235523

5524-
# Class: co:PMD_0000849 (Mechanische Eigenschaften Analyseverfahren)
5524+
# Class: co:PMD_0000849 (mechanical property analyzing process)
55255525

55265526
AnnotationAssertion(rdfs:label co:PMD_0000849 "Mechanische Eigenschaften Analyseverfahren"@de)
55275527
AnnotationAssertion(rdfs:label co:PMD_0000849 "mechanical property analyzing process"@en)
@@ -5704,7 +5704,7 @@ AnnotationAssertion(skos:definition co:PMD_0000875 "A Microscopy Process that us
57045704
AnnotationAssertion(skos:example co:PMD_0000875 "An example is Light Microscopy."@en)
57055705
SubClassOf(co:PMD_0000875 co:PMD_0000856)
57065706

5707-
# Class: co:PMD_0000876 (Optisches Profilometer)
5707+
# Class: co:PMD_0000876 (optical profilometer)
57085708

57095709
AnnotationAssertion(rdfs:label co:PMD_0000876 "Optisches Profilometer"@de)
57105710
AnnotationAssertion(rdfs:label co:PMD_0000876 "optical profilometer"@en)
@@ -5874,7 +5874,7 @@ AnnotationAssertion(skos:definition co:PMD_0000899 "Ein Herstellungsprozess, der
58745874
AnnotationAssertion(skos:example co:PMD_0000899 "Casting, Sintering"@en)
58755875
SubClassOf(co:PMD_0000899 co:PMD_0000833)
58765876

5877-
# Class: co:PMD_0000900 (Urformen Durch Additive Fertigung)
5877+
# Class: co:PMD_0000900 (primary shaping by additive manufacturing)
58785878

58795879
AnnotationAssertion(rdfs:label co:PMD_0000900 "Urformen Durch Additive Fertigung"@de)
58805880
AnnotationAssertion(rdfs:label co:PMD_0000900 "primary shaping by additive manufacturing"@en)
@@ -6487,7 +6487,7 @@ AnnotationAssertion(skos:example co:PMD_0000979 "Measuring the thermal conductiv
64876487
AnnotationAssertion(co:PMD_0050117 co:PMD_0000979 "TCMP"@en)
64886488
SubClassOf(co:PMD_0000979 co:PMD_0000982)
64896489

6490-
# Class: co:PMD_0000980 (Wärmeleitfähigkeitsmessfunktion)
6490+
# Class: co:PMD_0000980 (thermal conductivity measuring function)
64916491

64926492
AnnotationAssertion(rdfs:label co:PMD_0000980 "Wärmeleitfähigkeitsmessfunktion"@de)
64936493
AnnotationAssertion(rdfs:label co:PMD_0000980 "thermal conductivity measuring function"@en)

‎src/ontology/release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.0.0-alpha4
1+
VERSION=3.0.0
22
PRIOR_VERSION=2.0.1
33
ONTBASE=https://w3id.org/pmd/tto/
44
ANNOTATE_ONTOLOGY_VERSION="annotate -V $ONTBASE$VERSION/\$@ --annotation owl:versionInfo $VERSION"

‎src/ontology/tto-edit.owl‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Prefix(dcterms:=<http://purl.org/dc/terms/>)
1010

1111

1212
Ontology(<https://w3id.org/pmd/tto/>
13+
Import(<https://w3id.org/pmd/tto/imports/nfdicore_import.owl>)
1314
Import(<https://w3id.org/pmd/tto/imports/pmdco_import.owl>)
1415
Annotation(dcterms:contributor "https://orcid.org/0000-0003-1649-6832")
1516
Annotation(dcterms:creator <https://orcid.org/0000-0001-7192-7143>)
@@ -26,7 +27,9 @@ The TTO was developed in the frame of the PMD project. The TTO provides conceptu
2627
Annotation(dcterms:license <http://creativecommons.org/licenses/by/4.0/>)
2728
Annotation(dcterms:title "Tensile Test Ontology (TTO)")
2829

29-
Declaration(Class(:TTO_0000000))
30+
Declaration(Class(<https://w3id.org/pmd/TTO_0000000>))
31+
Declaration(Class(<https://w3id.org/pmd/TTO_0000001>))
32+
Declaration(Class(<https://w3id.org/pmd/TTO_0000002>))
3033
Declaration(Class(:TTO_0000001))
3134
Declaration(Class(:TTO_0000002))
3235
Declaration(Class(:TTO_0000004))
@@ -79,7 +82,6 @@ Declaration(Class(:TTO_0000051))
7982
Declaration(Class(:TTO_0000052))
8083
Declaration(Class(:TTO_0000053))
8184
Declaration(Class(:TTO_0000054))
82-
Declaration(Class(:TTO_0000055))
8385
Declaration(Class(:TTO_0000056))
8486
Declaration(Class(:TTO_0000057))
8587
Declaration(Class(:TTO_0000058))
@@ -101,13 +103,29 @@ Declaration(AnnotationProperty(pmd:symbol))
101103
# Classes
102104
############################
103105

104-
# Class: :TTO_0000000 (funder role)
106+
# Class: <https://w3id.org/pmd/TTO_0000000> (broken tested piece role)
105107

106-
AnnotationAssertion(rdfs:label :TTO_0000000 "Förderungsrolle"@de)
107-
AnnotationAssertion(rdfs:label :TTO_0000000 "funder role"@en)
108-
AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_0000000 "A funder role is a role that describes the capacity in which a party provides financial support to a project or initiative. This role is realized when the party participates in the project specifically as a source of funding, regardless of other potential involvements."@en)
109-
AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_0000000 "Eine Förderungsrolle (Rolle einer fördernden Partei) ist eine Rolle, die die Funktion beschreibt, in der eine Partei finanzielle Unterstützung für ein Projekt oder eine Initiative bereitstellt. Diese Rolle wird verwirklicht, wenn die Partei speziell als Geldgeber am Projekt teilnimmt, unabhängig von anderen möglichen Beteiligungen."@de)
110-
SubClassOf(:TTO_0000000 <http://purl.obolibrary.org/obo/BFO_0000023>)
108+
AnnotationAssertion(rdfs:label <https://w3id.org/pmd/TTO_0000000> "broken tested piece role"@en)
109+
SubClassOf(<https://w3id.org/pmd/TTO_0000000> pmd:PMD_0000975)
110+
111+
# Class: <https://w3id.org/pmd/TTO_0000001> (unbroken tested piece role)
112+
113+
AnnotationAssertion(rdfs:label <https://w3id.org/pmd/TTO_0000001> "unbroken tested piece role"@en)
114+
SubClassOf(<https://w3id.org/pmd/TTO_0000001> pmd:PMD_0000975)
115+
116+
# Class: <https://w3id.org/pmd/TTO_0000002> (tensile test result)
117+
118+
AnnotationAssertion(rdfs:label <https://w3id.org/pmd/TTO_0000002> "tensile test result"@en)
119+
SubClassOf(<https://w3id.org/pmd/TTO_0000002> <http://purl.obolibrary.org/obo/IAO_0000027>)
120+
SubClassOf(<https://w3id.org/pmd/TTO_0000002> ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/BFO_0000051> ObjectIntersectionOf(<http://purl.obolibrary.org/obo/IAO_0000109> ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/IAO_0000136> pmd:PMD_0000618))))
121+
122+
# Class: pmd:PMD_0000974 (Zugprüfverfahren)
123+
124+
SubClassOf(pmd:PMD_0000974 ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/BFO_0000055> pmd:PMD_0000975))
125+
SubClassOf(pmd:PMD_0000974 ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/OBI_0000293> ObjectIntersectionOf(<http://purl.obolibrary.org/obo/BFO_0000030> ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/RO_0000087> pmd:PMD_0000975))))
126+
SubClassOf(pmd:PMD_0000974 ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/OBI_0000299> <https://w3id.org/pmd/TTO_0000002>))
127+
SubClassOf(pmd:PMD_0000974 ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/OBI_0000299> ObjectIntersectionOf(<http://purl.obolibrary.org/obo/BFO_0000030> ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/RO_0000087> ObjectUnionOf(<https://w3id.org/pmd/TTO_0000000> <https://w3id.org/pmd/TTO_0000001>)))))
128+
SubClassOf(pmd:PMD_0000974 ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/RO_0000057> pmd:PMD_0000973))
111129

112130
# Class: :TTO_0000001 (load cell maximum force)
113131

@@ -260,7 +278,7 @@ AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_000001
260278
AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_0000015 "The length of a straight line through the center of an object (tensile test piece) as measured after a fracture occured during a test."@en)
261279
SubClassOf(:TTO_0000015 :TTO_0000002)
262280

263-
# Class: :TTO_0000016 (Abgeschätzte Dehngeschwindigkeit Über Die Parallele Länge)
281+
# Class: :TTO_0000016 (estimated strain rate over the parallel length)
264282

265283
AnnotationAssertion(rdfs:isDefinedBy :TTO_0000016 <https://w3id.org/pmd/tto>)
266284
AnnotationAssertion(rdfs:label :TTO_0000016 "Abgeschätzte Dehngeschwindigkeit Über Die Parallele Länge"@de)
@@ -434,7 +452,7 @@ AnnotationAssertion(pmd:definitionSource :TTO_0000028 "DIN EN ISO 6892-1:2019"@e
434452
AnnotationAssertion(pmd:symbol :TTO_0000028 "L_o"@en)
435453
SubClassOf(:TTO_0000028 :TTO_0000019)
436454

437-
# Class: :TTO_0000029 (Anfangs-Dicke)
455+
# Class: :TTO_0000029 (original thickness)
438456

439457
AnnotationAssertion(rdfs:isDefinedBy :TTO_0000029 <https://w3id.org/pmd/tto>)
440458
AnnotationAssertion(rdfs:label :TTO_0000029 "Anfangs-Dicke"@de)
@@ -525,7 +543,7 @@ AnnotationAssertion(pmd:definitionSource :TTO_0000035 "DIN EN ISO 6892-1:2019"@e
525543
SubClassOf(:TTO_0000035 :TTO_0000004)
526544
SubClassOf(:TTO_0000035 ObjectSomeValuesFrom(pmd:relatesTo :TTO_0000028))
527545

528-
# Class: :TTO_0000036 (Bleibende Extensometer-Dehnung)
546+
# Class: :TTO_0000036 (percentage permanent extension)
529547

530548
AnnotationAssertion(rdfs:isDefinedBy :TTO_0000036 <https://w3id.org/pmd/tto>)
531549
AnnotationAssertion(rdfs:label :TTO_0000036 "Bleibende Extensometer-Dehnung"@de)
@@ -763,17 +781,6 @@ AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_000005
763781
AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_0000054 "Eine Zugversuchsmethode ist eine Planspezifikation, die die Durchführung eines kontrollierten Versuchs zur Bestimmung der mechanischen Eigenschaften eines Materials unter einachsiger Zugbelastung vorschreibt. Der Plan legt Verfahrensschritte, Bedingungen und Messkriterien fest, um Eigenschaften wie die Zugfestigkeit, die Streckgrenze und die Bruchdehnung zu bestimmen."@de)
764782
SubClassOf(:TTO_0000054 <http://purl.obolibrary.org/obo/IAO_0000104>)
765783

766-
# Class: :TTO_0000055 (test piece)
767-
768-
AnnotationAssertion(rdfs:isDefinedBy :TTO_0000055 <https://w3id.org/pmd/tto>)
769-
AnnotationAssertion(rdfs:label :TTO_0000055 "Prüfkörper"@de)
770-
AnnotationAssertion(rdfs:label :TTO_0000055 "test piece"@en)
771-
AnnotationAssertion(rdfs:seeAlso :TTO_0000055 <https://w3id.org/pmd/co/2.0.8/TestPiece>)
772-
AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_0000055 "Part of a sample with specified dimensions, machined or un-machined, brought to a required condition for submission to a given test."@en)
773-
AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_0000055 "Teil einer Probe mit bestimmten Dimensionen, bearbeitet oder unbearbeitet, der in einen erforderlichen Zustand gebracht wird, um einer bestimmten Prüfung unterzogen zu werden."@de)
774-
AnnotationAssertion(pmd:definitionSource :TTO_0000055 "EN 10021:2006-12 (European standardization committee: CEN/TC 459/SC 12/WG 4)")
775-
SubClassOf(:TTO_0000055 ObjectIntersectionOf(<http://purl.obolibrary.org/obo/BFO_0000030> ObjectSomeValuesFrom(<http://purl.obolibrary.org/obo/BFO_0000196> pmd:PMD_0000975)))
776-
777784
# Class: :TTO_0000056 (thickness after fracture)
778785

779786
AnnotationAssertion(rdfs:isDefinedBy :TTO_0000056 <https://w3id.org/pmd/tto>)
@@ -794,7 +801,7 @@ AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_000005
794801
AnnotationAssertion(<http://www.w3.org/2004/02/skos/core#definition> :TTO_0000057 "This entity describes a single point at which a transition from one condition or state to another occurs, e.g. the point at which different phases of matter are capable of existing together in equilibrium (also called inversion point) or if process parameters are changed that will lead to a transition of the process during its execution."@en)
795802
SubClassOf(:TTO_0000057 pmd:PMD_0000008)
796803

797-
# Class: :TTO_0000058 (transition point testing rate)
804+
# Class: :TTO_0000058 (Umschaltpunkt der Prüfgeschwindigkeit)
798805

799806
AnnotationAssertion(rdfs:isDefinedBy :TTO_0000058 <https://w3id.org/pmd/tto>)
800807
AnnotationAssertion(rdfs:label :TTO_0000058 "Umschaltpunkt der Prüfgeschwindigkeit"@de)

‎src/ontology/tto-odk.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ export_formats:
1717
remove_owl_nothing: true
1818

1919
import_group:
20+
annotation_properties: ['rdfs:label','rdfs:comment', 'IAO:0000119','IAO:0000115', 'IAO:0000116', 'IAO:0000112', 'skos:definition', 'skos:example', 'skos:comment' ]
2021
products:
2122
- id: pmdco
2223
mirror_from: https://w3id.org/pmd/co/3.0.0-alpha4
2324
module_type: mirror
25+
- id: nfdicore
26+
mirror_from: https://nfdi.fiz-karlsruhe.de/ontology
27+
module_type: slme
28+
module_type_slme: SUBSET
29+
use_base: true

0 commit comments

Comments
 (0)