Merge branch '1.0.0-rc1' into full-documentation

emmo-repo · Aug 7, 2024 · dbc5cd4 · dbc5cd4
2 parents 64c1005 + 1197adb
commit dbc5cd4
Show file tree

Hide file tree

Showing 11 changed files with 11,596 additions and 12,248 deletions.
diff --git a/.github/emmocheck_conf.yml b/.github/emmocheck_conf.yml
@@ -22,6 +22,11 @@ test_quantity_dimension:
     - emmo.ISQDerivedQuantity
     - emmo.SIExactConstant
 
+test_class_label:
+  exceptions:
+    - pH
+    - 3DPrinting
+
 test_unit_dimension:
   exceptions:
     - emmo.MultipleUnit

diff --git a/disciplines/units/coherentsiunits.ttl b/disciplines/units/coherentsiunits.ttl
diff --git a/disciplines/units/noncoherentsiunits.ttl b/disciplines/units/noncoherentsiunits.ttl
diff --git a/disciplines/units/prefixedsiunits.ttl b/disciplines/units/prefixedsiunits.ttl
diff --git a/disciplines/units/prefixedunits.ttl b/disciplines/units/prefixedunits.ttl
diff --git a/disciplines/units/siacceptedunits.ttl b/disciplines/units/siacceptedunits.ttl
diff --git a/disciplines/units/siunits.ttl b/disciplines/units/siunits.ttl
@@ -629,7 +629,7 @@ kg/m^3""" ;
                                                                  :EMMO_e9ffc696_5228_4ff9_8a60_0f5e05e9931b
                                                                ) ;
                                            skos:prefLabel "SICoherentUnit"@en ;
-                                           :EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "A unit that can be expressed as a product of powers of SI base units with no pre-factor of offset."@en ;
+                                           :EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "A unit that can be expressed as a product of powers of SI base units with no pre-factor or offset."@en ;
                                            :EMMO_c7b62dd7_063a_4c2a_8504_42f7264ba83f "Derived units are defined as products of powers of the base units. When the numerical factor of this product is one, the derived units are called coherent derived units. The base and coherent derived units of the SI form a coherent set, designated the set of coherent SI units."@en .
 
 
@@ -681,7 +681,7 @@ kg/m^3""" ;
                                                                  :EMMO_d41ce84b_4317_41fb_a5d1_6cd281fca106
                                                                ) ;
                                            skos:prefLabel "SINonCoherentUnit"@en ;
-                                           :EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "A unit whos numerical factor in front of the product of base units is NOT equal to one."@en ;
+                                           :EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "An SI unit whos numerical factor in front of the product of base SI units is NOT equal to one."@en ;
                                            :EMMO_c7b62dd7_063a_4c2a_8504_42f7264ba83f """A non-SI coherent can be expressed in terms of its corresponding SI coherent unit, as
 
     nonsi_coherent_unit = si_coherent_unit * multiplier + offset

diff --git a/disciplines/units/unclassifiedunits.ttl b/disciplines/units/unclassifiedunits.ttl
diff --git a/disciplines/units/unitsextension.ttl b/disciplines/units/unitsextension.ttl
@@ -35,11 +35,54 @@ We kindly acknowledge NIST for reusing their content, including the selection of
 #################################################################
 
 
+###  https://w3id.org/emmo#Year
+emmo:Year rdf:type owl:Class ;
+          rdfs:subClassOf emmo:EMMO_02e894c3_b793_4197_b120_3442e08f58d1 ,
+                          emmo:EMMO_8246541a_f1f6_4d03_8bd7_fc6b76d17375 ,
+                          emmo:EMMO_868ae137_4d25_493e_b270_21ea3d94849e ,
+                          emmo:EMMO_b081b346_7279_46ef_9a3d_2c088fcd79f4 ,
+                          [ rdf:type owl:Restriction ;
+                            owl:onProperty emmo:EMMO_8189b42e_0995_423a_a26c_51168b27c3cf ;
+                            owl:hasValue "3.15576E7"^^xsd:double
+                          ] ,
+                          [ rdf:type owl:Restriction ;
+                            owl:onProperty emmo:EMMO_d088a3cb_d3e3_4eb2_9897_00aef0cb00cd ;
+                            owl:hasValue "0.0"^^xsd:double
+                          ] ;
+          rdfs:isDefinedBy "http://qudt.org/2.1/vocab/unit" ;
+          rdfs:seeAlso "http://www.oxfordreference.com/view/10.1093/acref/9780198605225.001.0001/acref-9780198605225-e-1533?rskey=b94Fd6" ;
+          skos:prefLabel "Year"@en ;
+          emmo:EMMO_1f1b164d_ec6a_4faa_8d5e_88bda62316cc "http://qudt.org/vocab/unit/YR" ;
+          emmo:EMMO_33ae2d07_5526_4555_a0b4_8f4c031b5652 "a" ;
+          emmo:EMMO_7f1dec83_d85e_4e1b_b7bd_c9442d4f5a64 "yr" ;
+          emmo:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 """A year is any of the various periods equated with one passage of Earth about the Sun, and hence of roughly 365 days. The familiar calendar has a mixture of 365- and 366-day years, reflecting the fact that the time for one complete passage takes about 365¼ days; the precise value for this figure depends on the manner of defining the year.
 
+-- QUDT"""@en .
 
 
+###  https://w3id.org/emmo#Week
+emmo:Week rdf:type owl:Class ;
+          rdfs:subClassOf emmo:EMMO_02e894c3_b793_4197_b120_3442e08f58d1 ,
+                          emmo:EMMO_8246541a_f1f6_4d03_8bd7_fc6b76d17375 ,
+                          emmo:EMMO_868ae137_4d25_493e_b270_21ea3d94849e ,
+                          emmo:EMMO_b081b346_7279_46ef_9a3d_2c088fcd79f4 ,
+                          [ rdf:type owl:Restriction ;
+                            owl:onProperty emmo:EMMO_8189b42e_0995_423a_a26c_51168b27c3cf ;
+                            owl:hasValue "604800.0"^^xsd:double
+                          ] ,
+                          [ rdf:type owl:Restriction ;
+                            owl:onProperty emmo:EMMO_d088a3cb_d3e3_4eb2_9897_00aef0cb00cd ;
+                            owl:hasValue "0.0"^^xsd:double
+                          ] ;
+          rdfs:isDefinedBy "http://qudt.org/2.1/vocab/unit" ;
+          skos:prefLabel "Week"@en ;
+          emmo:EMMO_1f1b164d_ec6a_4faa_8d5e_88bda62316cc "http://qudt.org/vocab/unit/WK" ;
+          emmo:EMMO_33ae2d07_5526_4555_a0b4_8f4c031b5652 "wk" ;
+          emmo:EMMO_7f1dec83_d85e_4e1b_b7bd_c9442d4f5a64 "wk" ;
+          emmo:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 """Mean solar week
 
-
+-- QUDT"""@en ;
+          emmo:EMMO_c84c6752_6d64_48cc_9500_e54a3c34898d "http://en.wikipedia.org/wiki/Week?oldid=493867029" .
 
 
 

diff --git a/emmo-full.ttl b/emmo-full.ttl
@@ -17,9 +17,16 @@
         <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unitsextension> ,
         <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unclassifiedunits> ;
     dcterms:abstract "This module provide a full version of EMMO, including additional mereocausal concepts and non-SI units."@en ;
-    dcterms:contributor <https://orcid.org/0000-0002-4181-2852> ;
+    dcterms:contributor <https://orcid.org/0009-0007-5850-6628> ,
+                        <https://orcid.org/0009-0008-8009-5009> ,
+                        <https://orcid.org/0000-0001-8869-3718> ,
+                        <https://orcid.org/0000-0002-8758-6109> ,
+                        <https://orcid.org/0000-0001-7815-6636> ;
     dcterms:creator <https://orcid.org/0000-0002-1560-809X> ,
-                    <https://orcid.org/0000-0003-3805-8761> ;
+                    <https://orcid.org/0000-0002-4181-2852> ,
+                    <https://orcid.org/0000-0003-0514-9229> ,
+                    <https://orcid.org/0000-0003-3805-8761> ,
+                    <https://orcid.org/0000-0003-4065-9742> ;
     dcterms:license "https://creativecommons.org/licenses/by/4.0/legalcode" ;
     dcterms:publisher <https://emmc.eu> ;
     dcterms:title "EMMO-full"@en ;

diff --git a/emmo.ttl b/emmo.ttl
@@ -24,7 +24,10 @@ EMMO is released under a Creative Commons license Attribution 4.0 International
                          dcterms:alternative "EMMO"@en ;
                          dcterms:bibliographicCitation "F. A. Zaccarini, C. Masolo, E. Ghedini, and S. Borgo. From Causation (and Parthood) to Time: The Case of EMMO (2023) doi: 10.3233/FAIA231120" ;
                          dcterms:contributor <https://orcid.org/0009-0007-5850-6628> ,
-                                             <https://orcid.org/0009-0008-8009-5009> ;
+                                             <https://orcid.org/0009-0008-8009-5009> ,
+                                             <https://orcid.org/0000-0001-8869-3718> ,
+                                             <https://orcid.org/0000-0002-8758-6109> ,
+                                             <https://orcid.org/0000-0001-7815-6636> ;
                          dcterms:created "2024-03" ;
                          dcterms:creator <https://orcid.org/0000-0002-1560-809X> ,
                                          <https://orcid.org/0000-0002-4181-2852> ,