Skip to content

Commit

Permalink
Merge branch '1.0.0-beta5' into holistic_top_level
Browse files Browse the repository at this point in the history
  • Loading branch information
@emanueleghedini
emanueleghedini committed Jan 16, 2024
2 parents 6a8bd44 + 17db16d commit a6c3cfa
Show file tree
Hide file tree
Showing 7 changed files with 310 additions and 67 deletions.
39 changes: 39 additions & 0 deletions .github/expected_redirections.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Input file for testing redirections
#
# These redirections can be tested using the redirectioncheck tool from EMMOntoPy:
#
# pip install EMMOntoPy
# redirectioncheck expected_redirections.yaml
#

---
redirections:

# EMMO
https://w3id.org/emmo: https://emmo-repo.github.io/emmo.ttl # ttl file because tests are not from a browser
https://w3id.org/emmo/inferred: https://emmo-repo.github.io/emmo-inferred.ttl
https://w3id.org/emmo/dev: https://emmo-repo.github.io/development/emmo.ttl
https://w3id.org/emmo/dev-inferred: https://emmo-repo.github.io/development/emmo-inferred.ttl
https://w3id.org/emmo/1.0.0-beta4: https://emmo-repo.github.io/versions/1.0.0-beta4/emmo.ttl
https://w3id.org/emmo/1.0.0-beta4/inferred: https://emmo-repo.github.io/versions/1.0.0-beta4/emmo-inferred.ttl
https://w3id.org/emmo/1.0.0-beta5: https://emmo-repo.github.io/versions/1.0.0-beta5/emmo.ttl

https://w3id.org/emmo/: https://raw.githubusercontent.com/emmo-repo/EMMO/master/emmo.ttl
https://w3id.org/emmo/1.0.0-beta5/: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/emmo.ttl
https://w3id.org/emmo/1.0.0-beta5/mereocausality: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/mereocausality/mereocausality.ttl
https://w3id.org/emmo/1.0.0-beta5/perspectives: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/perspectives/perspectives.ttl
https://w3id.org/emmo/1.0.0-beta5/multiperspective: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/multiperspective/multiperspective.ttl
https://w3id.org/emmo/1.0.0-beta5/disciplines: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/disciplines/disciplines.ttl
https://w3id.org/emmo/1.0.0-beta5/disciplines/units: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/disciplines/disciplines/units.ttl
https://w3id.org/emmo/master: https://raw.githubusercontent.com/emmo-repo/EMMO/master/emmo.ttl
https://w3id.org/emmo/master/: https://raw.githubusercontent.com/emmo-repo/EMMO/master/emmo.ttl
https://w3id.org/emmo/source: https://raw.githubusercontent.com/emmo-repo/EMMO/master/emmo.ttl
https://w3id.org/emmo/source/: https://raw.githubusercontent.com/emmo-repo/EMMO/master/emmo.ttl
https://w3id.org/emmo/perspectives/data: https://raw.githubusercontent.com/emmo-repo/EMMO/master/perspectives/data.ttl
https://w3id.org/emmo/perspectives/data/: https://raw.githubusercontent.com/emmo-repo/EMMO/master/perspectives/data.ttl
https://w3id.org/emmo/1.0.0-beta5/perspectives/data: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/perspectives/data.ttl
https://w3id.org/emmo/1.0.0-beta5/perspectives/data/: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/perspectives/data.ttl

# Battery
https://w3id.org/emmo/domain/battery#battery_50b911f7_c903_4700_9764_c308d8a95470: https://emmo-repo.github.io/domain-battery.ttl
https://w3id.org/emmo/domain/battery: https://emmo-repo.github.io/domain-battery.ttl
278 changes: 223 additions & 55 deletions disciplines/computerscience.ttl
View file

Large diffs are not rendered by default.

17 changes: 13 additions & 4 deletions disciplines/isq.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1913,7 +1913,7 @@ pH = −10 log(a_OH-)"""@en ;

### http://emmo.info/emmo#EMMO_4024a7f8_2991_4d80_bcc9_63705aa0c750
:EMMO_4024a7f8_2991_4d80_bcc9_63705aa0c750 rdf:type owl:Class ;
rdfs:subClassOf :EMMO_cd2cd0de_e0cc_4ef1_b27e_2e88db027bac ;
rdfs:subClassOf :EMMO_a242d3e9_c6d3_411e_a667_71ffbc248a1a ;
:EMMO_1f1b164d_ec6a_4faa_8d5e_88bda62316cc "https://qudt.org/vocab/quantitykind/Displacement" ;
:EMMO_26bf1bef_d192_4da6_b0eb_d2209698fb54 "https://www.wikidata.org/wiki/Q190291" ;
:EMMO_50c298c2_55a2_4068_b3ac_4e948c33181f "https://www.electropedia.org/iev/iev.nsf/display?openform&ievref=113-01-29" ;
Expand Down Expand Up @@ -1998,7 +1998,7 @@ pH = −10 log(a_OH-)"""@en ;

### http://emmo.info/emmo#EMMO_4312cae4_03ba_457e_b35d_0671a7db350c
:EMMO_4312cae4_03ba_457e_b35d_0671a7db350c rdf:type owl:Class ;
rdfs:subClassOf :EMMO_cd2cd0de_e0cc_4ef1_b27e_2e88db027bac ;
rdfs:subClassOf :EMMO_a242d3e9_c6d3_411e_a667_71ffbc248a1a ;
:EMMO_26bf1bef_d192_4da6_b0eb_d2209698fb54 "https://www.wikidata.org/wiki/Q192388" ;
:EMMO_50c298c2_55a2_4068_b3ac_4e948c33181f "https://www.electropedia.org/iev/iev.nsf/display?openform&ievref=102-03-15" ;
:EMMO_6dd685dd_1895_46e4_b227_be9f7d643c25 "https://dbpedia.org/page/Position_(geometry)" ;
Expand Down Expand Up @@ -4138,6 +4138,7 @@ where g is the appropriate g factor, μ is mostly the Bohr magneton or nuclear m
:EMMO_50c298c2_55a2_4068_b3ac_4e948c33181f "https://www.electropedia.org/iev/iev.nsf/display?openform&ievref=113-03-61" ;
:EMMO_8de5d5bf_db1c_40ac_b698_095ba3b18578 "4-18" ;
:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "Ratio of transverse strain to axial strain."@en ;
skos:altLabel "PoissonsRatio"@en ;
skos:prefLabel "PoissonNumber"@en .


Expand Down Expand Up @@ -4721,7 +4722,11 @@ where g is the appropriate g factor, μ is mostly the Bohr magneton or nuclear m
### http://emmo.info/emmo#EMMO_a1bd0bfc_5464_43ce_a1a2_947b58dc0f89
:EMMO_a1bd0bfc_5464_43ce_a1a2_947b58dc0f89 rdf:type owl:Class ;
rdfs:subClassOf :EMMO_4024a7f8_2991_4d80_bcc9_63705aa0c750 ,
:EMMO_c29603f5_95e8_42f5_ab0c_f3bcf3166d53 ;
:EMMO_c29603f5_95e8_42f5_ab0c_f3bcf3166d53 ,
[ rdf:type owl:Restriction ;
owl:onProperty :EMMO_bed1d005_b04e_4a90_94cf_02bc678a8569 ;
owl:someValuesFrom :EMMO_b3600e73_3e05_479d_9714_c041c3acf5cc
] ;
:EMMO_1f1b164d_ec6a_4faa_8d5e_88bda62316cc "https://qudt.org/vocab/quantitykind/LatticeVector" ;
:EMMO_26bf1bef_d192_4da6_b0eb_d2209698fb54 "https://www.wikidata.org/wiki/Q105435234" ;
:EMMO_8de5d5bf_db1c_40ac_b698_095ba3b18578 "12-1.1" ;
Expand Down Expand Up @@ -6279,7 +6284,11 @@ Conductivity is equeal to the resiprocal of resistivity."""@en ;
### http://emmo.info/emmo#EMMO_da4ea7e3_6e60_410b_a209_6ea735a6b10c
:EMMO_da4ea7e3_6e60_410b_a209_6ea735a6b10c rdf:type owl:Class ;
rdfs:subClassOf :EMMO_4024a7f8_2991_4d80_bcc9_63705aa0c750 ,
:EMMO_c29603f5_95e8_42f5_ab0c_f3bcf3166d53 ;
:EMMO_c29603f5_95e8_42f5_ab0c_f3bcf3166d53 ,
[ rdf:type owl:Restriction ;
owl:onProperty :EMMO_bed1d005_b04e_4a90_94cf_02bc678a8569 ;
owl:someValuesFrom :EMMO_b3600e73_3e05_479d_9714_c041c3acf5cc
] ;
:EMMO_1f1b164d_ec6a_4faa_8d5e_88bda62316cc "https://qudt.org/vocab/quantitykind/BurgersVector" ;
:EMMO_26bf1bef_d192_4da6_b0eb_d2209698fb54 "https://www.wikidata.org/wiki/Q623093" ;
:EMMO_8de5d5bf_db1c_40ac_b698_095ba3b18578 "12-6" ;
Expand Down
6 changes: 3 additions & 3 deletions disciplines/periodictable.ttl
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
@prefix : <http://emmo.info/emmo/disciplines/periodictable#> .
@prefix : <http://emmo.info/emmo#> .
@prefix dcterms: <http://purl.org/dc/terms/> .
@prefix emmo: <http://emmo.info/emmo#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@base <http://emmo.info/emmo#> .

: a owl:Ontology ;
<http://emmo.info/emmo/disciplines/periodictable> a owl:Ontology ;
emmo:EMMO_c7b62dd7_063a_4c2a_8504_42f7264ba83f "The EMMO requires HermiT reasoner plugin in order to visualize all inferences and class hierarchy (ctrl+R hotkey in Protege)."@en,
"This ontology is generated with EMMOntoPy using data from the ASE Python package."@en,
"You can contact EMMO Authors via emmo@emmc.eu"@en ;
Expand Down Expand Up @@ -2520,4 +2521,3 @@
rdfs:domain emmo:EMMO_eb77076b_a104_42ac_a065_798b2d2809ad ;
rdfs:range xsd:integer ;
skos:prefLabel "hasAtomicNumber"@en .

8 changes: 4 additions & 4 deletions disciplines/units/siacceptedunits.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ We kindly acknowledge NIST for reusing their content, including the selection of
### http://emmo.info/emmo#AmpereHourPerLitre
:AmpereHourPerLitre rdf:type owl:Class ;
rdfs:subClassOf :EMMO_8f36559a_a494_4b00_abc5_60bbc1475009 ,
:ac19c801_bead_4730_8b8c_50020eec45ec ,
:EMMO_ac19c801_bead_4730_8b8c_50020eec45ec ,
[ rdf:type owl:Restriction ;
owl:onProperty :EMMO_8189b42e_0995_423a_a26c_51168b27c3cf ;
owl:hasValue "3600000.0"^^xsd:double
Expand All @@ -52,7 +52,7 @@ We kindly acknowledge NIST for reusing their content, including the selection of
### http://emmo.info/emmo#AmpereHourPerKilogram
:AmpereHourPerKilogram rdf:type owl:Class ;
rdfs:subClassOf :EMMO_4dbe2b16_3e84_4049_898d_eb89bcc925a2 ,
:ac19c801_bead_4730_8b8c_50020eec45ec ,
:EMMO_ac19c801_bead_4730_8b8c_50020eec45ec ,
[ rdf:type owl:Restriction ;
owl:onProperty :EMMO_8189b42e_0995_423a_a26c_51168b27c3cf ;
owl:hasValue "3600.0"^^xsd:double
Expand All @@ -68,7 +68,7 @@ We kindly acknowledge NIST for reusing their content, including the selection of
### http://emmo.info/emmo#WattHourPerKilogram
:WattHourPerKilogram rdf:type owl:Class ;
rdfs:subClassOf :EMMO_847f1d9f_205e_46c1_8cb6_a9e479421f88 ,
:ac19c801_bead_4730_8b8c_50020eec45ec ,
:EMMO_ac19c801_bead_4730_8b8c_50020eec45ec ,
[ rdf:type owl:Restriction ;
owl:onProperty :EMMO_8189b42e_0995_423a_a26c_51168b27c3cf ;
owl:hasValue "3600.0"^^xsd:double
Expand All @@ -85,7 +85,7 @@ We kindly acknowledge NIST for reusing their content, including the selection of
### http://emmo.info/emmo#WattHourPerLitre
:WattHourPerLitre rdf:type owl:Class ;
rdfs:subClassOf :EMMO_53bd0c90_41c3_46e2_8779_cd2a80f7e18b ,
:ac19c801_bead_4730_8b8c_50020eec45ec ,
:EMMO_ac19c801_bead_4730_8b8c_50020eec45ec ,
[ rdf:type owl:Restriction ;
owl:onProperty :EMMO_8189b42e_0995_423a_a26c_51168b27c3cf ;
owl:hasValue "3600000.0"^^xsd:double
Expand Down
2 changes: 1 addition & 1 deletion disciplines/units/units.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@prefix dcterms: <http://purl.org/dc/terms/> .
@base <http://emmo.info/emmo#> .

<http://emmo.info/emmo/disciplines/sisystem> rdf:type owl:Ontology ;
<http://emmo.info/emmo/disciplines/units> rdf:type owl:Ontology ;
owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/units> ;
owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits> ,
<http://emmo.info/emmo/1.0.0-beta5/disciplines/units/noncoherentsiunits> ,
Expand Down
Loading

0 comments on commit a6c3cfa

Please sign in to comment.