Refactor units (#312)

Refactor and update the unit modules to the following structure: * Modules for categorising units: - **sidimensionalunits**: A module with classes categorising units according to their SI physical dimensions. * Modules with SI units: - **siunits**: The 7 base units and 22 derived units as well as the metric prefixes specified in the SI system. - **prefixedsiunits**: SI units made of a metric prefix and a SI base, derived or accepted unit. Examples: km, mg... - **coherentsiunits**: Coherent SI-units. Products of integer powers of the base and derived SI units. Examples: A/J, Nm, m³, ... - **noncoherentsiunits**: Non-coherent SI-units whos numerical factor in front of the product of base SI units is NOT equal to one. This include all SI-units not included in the modules above. Examples: g, mg/s... * Modules with non-SI units: - **siacceptedunits**: The 15 non-SI units that are accepted for use with SI. - **siacceptedderivedunits**: Non-SI units that consists an optional metric prefix followed by a product of integer powers of the base, derived and accepted SI units. The product must include at least one SI-accepted unit. Examples: km/h, kWh, MeV, etc... - **specialunits**: Non-SI special units. Examples: Day, Week, Bar, Inch, ... - **otherunits**: All other non-SI units that does not belong to any of the modules above. * Additional modules: - **unclassifiedunits**: Units copied from QUDT that has not yet been classified in one of the above modules. - **deprecated**: Units classes that have been deprecated - typically because of change of IRI. Make the prefixed unit classes independent of SI to avoid inconsistencies for non-SI units with a metric prefix like kBar.
emmo-repo · Aug 8, 2024 · 8697af8 · 8697af8
1 parent 24eb977
commit 8697af8
Show file tree

Hide file tree

Showing 20 changed files with 14,486 additions and 14,272 deletions.
diff --git a/.github/emmocheck_conf.yml b/.github/emmocheck_conf.yml
@@ -1,4 +1,7 @@
 # Configurations used when running emmocheck from the ci_emmocheck workflow
+skip:
+  - test_description
+
 test_namespace:
   exceptions:
     - manufacturing.EngineeredMaterial

diff --git a/catalog-v001.xml b/catalog-v001.xml
@@ -42,22 +42,24 @@
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/isq"                 uri="./disciplines/isq.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/sisystem"            uri="./disciplines/sisystem.ttl"/>
 
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units"                     uri="./disciplines/units/units.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/sidimensionalunits"  uri="./disciplines/units/sidimensionalunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siunits"             uri="./disciplines/units/siunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/coherentsiunits"     uri="./disciplines/units/coherentsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/noncoherentsiunits"  uri="./disciplines/units/noncoherentsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedsiunits"     uri="./disciplines/units/prefixedsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedunits"     uri="./disciplines/units/siacceptedunits.ttl"/>
-
-        <!-- Imported by emmo-full -->
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/mereocausality-full"                   uri="./mereocausality/mereocausality-full.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedunits"       uri="./disciplines/units/prefixedunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unitsextension"      uri="./disciplines/units/unitsextension.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unclassifiedunits"   uri="./disciplines/units/unclassifiedunits.ttl"/>
-
-        <!-- Deprecated units -->
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/deprecated"          uri="./disciplines/units/deprecated.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units"                         uri="./disciplines/units/units.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/sidimensionalunits"      uri="./disciplines/units/sidimensionalunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siunits"                 uri="./disciplines/units/siunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedsiunits"         uri="./disciplines/units/prefixedsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/coherentsiunits"         uri="./disciplines/units/coherentsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/noncoherentsiunits"      uri="./disciplines/units/noncoherentsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedspecialunits"  uri="./disciplines/units/siacceptedspecialunits.ttl"/>
+
+        <!-- Imported by emmo-full  -->
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedunits"         uri="./disciplines/units/siacceptedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/specialunits"            uri="./disciplines/units/specialunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/otherunits"              uri="./disciplines/units/otherunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unclassifiedunits"       uri="./disciplines/units/unclassifiedunits.ttl"/>
+
+        <!-- Deprecated  -->
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unitsextension"          uri="./disciplines/units/unitsextension.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedunits"           uri="./disciplines/units/prefixedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/deprecated"              uri="./disciplines/units/deprecated.ttl"/>
 
     </group>
 </catalog>
diff --git a/disciplines/catalog-v001.xml b/disciplines/catalog-v001.xml
@@ -41,22 +41,24 @@
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/isq"                 uri="../disciplines/isq.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/sysystem"            uri="../disciplines/sisystem.ttl"/>
 
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units"                     uri="../disciplines/units/units.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/sidimensionalunits"  uri="../disciplines/units/sidimensionalunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siunits"             uri="../disciplines/units/siunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/coherentsiunits"     uri="../disciplines/units/coherentsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/noncoherentsiunits"  uri="../disciplines/units/noncoherentsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedsiunits"     uri="../disciplines/units/prefixedsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedunits"     uri="../disciplines/units/siacceptedunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unclassifiedunits"   uri="../disciplines/units/unclassifiedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units"                         uri="../disciplines/units/units.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/sidimensionalunits"      uri="../disciplines/units/sidimensionalunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siunits"                 uri="../disciplines/units/siunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedsiunits"         uri="../disciplines/units/prefixedsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/coherentsiunits"         uri="../disciplines/units/coherentsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/noncoherentsiunits"      uri="../disciplines/units/noncoherentsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedspecialunits"  uri="../disciplines/units/siacceptedspecialunits.ttl"/>
 
         <!-- Imported by emmo-full  -->
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unitsextension"      uri="../disciplines/units/unitsextension.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedunits"       uri="../disciplines/units/prefixedunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unclassifiedunits"   uri="../disciplines/units/unclassifiedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedunits"         uri="../disciplines/units/siacceptedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/specialunits"            uri="../disciplines/units/specialunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/otherunits"              uri="../disciplines/units/otherunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unclassifiedunits"       uri="../disciplines/units/unclassifiedunits.ttl"/>
 
         <!-- Deprecated  -->
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/deprecated"          uri="../disciplines/units/deprecated.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unitsextension"          uri="../disciplines/units/unitsextension.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedunits"           uri="../disciplines/units/prefixedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/deprecated"              uri="../disciplines/units/deprecated.ttl"/>
 
     </group>
 </catalog>
diff --git a/disciplines/sisystem.ttl b/disciplines/sisystem.ttl
@@ -13,7 +13,7 @@
                                               owl:imports <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/coherentsiunits> ,
                                                           <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/noncoherentsiunits> ,
                                                           <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedsiunits> ,
-                                                          <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedunits> ,
+                                                          <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedspecialunits> ,
                                                           <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/sidimensionalunits> .
 
 ###  Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi
diff --git a/disciplines/units/catalog-v001.xml b/disciplines/units/catalog-v001.xml
@@ -36,22 +36,26 @@
 
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/metrology"           uri="../../disciplines/metrology.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/isq"                 uri="../../disciplines/isq.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/sisystem"            uri="../../disciplines/sisystem.ttl"/>
 
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/sisystem"                  uri="../../disciplines/sisystem.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/sidimensionalunits"  uri="../../disciplines/units/sidimensionalunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siunits"             uri="../../disciplines/units/siunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/coherentsiunits"     uri="../../disciplines/units/coherentsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/noncoherentsiunits"  uri="../../disciplines/units/noncoherentsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedsiunits"     uri="../../disciplines/units/prefixedsiunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedunits"     uri="../../disciplines/units/siacceptedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units"                         uri="../../disciplines/units/units.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/sidimensionalunits"      uri="../../disciplines/units/sidimensionalunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siunits"                 uri="../../disciplines/units/siunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedsiunits"         uri="../../disciplines/units/prefixedsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/coherentsiunits"         uri="../../disciplines/units/coherentsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/noncoherentsiunits"      uri="../../disciplines/units/noncoherentsiunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedspecialunits"  uri="../../disciplines/units/siacceptedspecialunits.ttl"/>
 
         <!-- Imported by emmo-full  -->
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unitsextension"      uri="../../disciplines/units/unitsextension.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedunits"       uri="../../disciplines/units/prefixedunits.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unclassifiedunits"   uri="../../disciplines/units/unclassifiedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/siacceptedunits"         uri="../../disciplines/units/siacceptedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/specialunits"            uri="../../disciplines/units/specialunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/otherunits"              uri="../../disciplines/units/otherunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unclassifiedunits"       uri="../../disciplines/units/unclassifiedunits.ttl"/>
 
         <!-- Deprecated  -->
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/deprecated"          uri="../../disciplines/units/deprecated.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/unitsextension"          uri="../../disciplines/units/unitsextension.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/prefixedunits"           uri="../../disciplines/units/prefixedunits.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/units/deprecated"              uri="../../disciplines/units/deprecated.ttl"/>
 
     </group>
 </catalog>