Merge branch '1.0.0-rc3' into hasSIQuantityValue

emmo-repo · Dec 10, 2024 · 4e36620 · 4e36620
2 parents 7dd61e1 + ac3c9bb
commit 4e36620
Show file tree

Hide file tree

Showing 27 changed files with 1,757 additions and 1,121 deletions.
diff --git a/.github/expected_redirections.yaml b/.github/expected_redirections.yaml
@@ -9,6 +9,26 @@
 ---
 redirections:
 
+
+  # CHAMEO
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo:             https://emmo-repo.github.io/domain-characterisation-methodology/chameo.ttl
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo#:            https://emmo-repo.github.io/domain-characterisation-methodology/chameo.ttl
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo/inferred:    https://emmo-repo.github.io/domain-characterisation-methodology/chameo-inferred.ttl
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo/turtle:      https://emmo-repo.github.io/domain-characterisation-methodology/chameo.ttl
+  #https://w3id.org/emmo/domain/characterisation-methodology/chameo/context:     https://emmo-repo.github.io/domain-characterisation-methodology/context/chameo.json
+  #https://w3id.org/emmo/domain/characterisation-methodology/chameo/context/ch:  https://emmo-repo.github.io/domain-characterisation-methodology/context/ch.json
+
+  #https://w3id.org/emmo/domain/characterisation-methodology/chameo/:            https://raw.githubusercontent.com/emmo-repo/domain-characterisation-methodology/master/chameo.ttl
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo/latest:      https://raw.githubusercontent.com/emmo-repo/domain-characterisation-methodology/master/chameo.ttl
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo/latest/:     https://raw.githubusercontent.com/emmo-repo/domain-characterisation-methodology/master/chameo.ttl
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo/source:      https://raw.githubusercontent.com/emmo-repo/domain-characterisation-methodology/master/chameo.ttl
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo/source/:     https://raw.githubusercontent.com/emmo-repo/domain-characterisation-methodology/master/chameo.ttl
+
+  #https://w3id.org/emmo/domain/characterisation-methodology/chameo/1.0.0-beta3: https://emmo-repo.github.io/domain-characterisation-methodology/versions/1.0.0-beta3/chameo.ttl
+
+  https://w3id.org/emmo/domain/characterisation-methodology/chameo/1.0.0-beta3/source:  https://raw.githubusercontent.com/emmo-repo/domain-characterisation-methodology/1.0.0-beta3/chameo.ttl
+
+
   # EMMO
   https://w3id.org/emmo#fragment:                       https://emmo-repo.github.io/emmo.ttl#fragment  # ttl file because tests are not from a browser
 

diff --git a/.github/workflows/cd_update_pages.yml b/.github/workflows/cd_update_pages.yml
@@ -42,8 +42,8 @@ jobs:
       run: |
         pip install --upgrade pip
         pip install sphinx sphinxcontrib-globalsubs sphinx_design nbsphinx pydata-sphinx-theme
-        pip install git+https://github.com/emmo-repo/EMMOntoPy.git@get_datatype_class
-        #pip install git+https://github.com/emmo-repo/EMMOntoPy.git@master
+        #pip install git+https://github.com/emmo-repo/EMMOntoPy.git@get_datatype_class
+        pip install git+https://github.com/emmo-repo/EMMOntoPy.git@master
         #pip install sphinx EMMOntoPy
 
     - name: Create and prepare build and public directories

diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ The reference ontologies are intended to be used by domain ontologies and import
 | Materials          | [https://w3id.org/emmo/reference/materials](https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-rc3/reference/materials.ttl)   |
 | Math               | [https://w3id.org/emmo/reference/math](https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-rc3/reference/math.ttl)             |
 | Models             | [https://w3id.org/emmo/reference/models](https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-rc3/reference/models.ttl)         |
-| Properties         | [https://w3id.org/emmo/reference/properties](https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-rc3/reference/properties.ttl) |
+| Properties         | [https://w3id.org/emmo/disciplines/properties](https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-rc3/disciplines/properties.ttl) |
 | Metrology          | [https://w3id.org/emmo/reference/metrology](https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-rc3/reference/metrology.ttl)   |
 | Isq                | [https://w3id.org/emmo/reference/isq](https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-rc3/reference/isq.ttl)               |
 | Siunits            | [https://w3id.org/emmo/domain/siunits](https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-rc3/domain/siunits.ttl)                           |

diff --git a/catalog-v001.xml b/catalog-v001.xml
@@ -18,14 +18,14 @@
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference"                    uri="./reference/reference.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/persholistic"       uri="./reference/persholistic.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/properties"         uri="./reference/properties.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/symbolic"           uri="./reference/symbolic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/information"        uri="./reference/information.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/workflow"           uri="./reference/workflow.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/physicalistic"      uri="./reference/physicalistic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/standardmodel-full" uri="./reference/standardmodel-full.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/standardmodel"      uri="./reference/standardmodel.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/data"               uri="./reference/data.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/agency"             uri="./reference/agency.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines"                     uri="./disciplines/disciplines.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/chemistry"           uri="./disciplines/chemistry.ttl"/>
@@ -37,6 +37,7 @@
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/periodictable"       uri="./disciplines/periodictable.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/perceptual"          uri="./disciplines/perceptual.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/geometrical"         uri="./disciplines/geometrical.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/properties"         uri="./disciplines/properties.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/dataset"             uri="./disciplines/dataset.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/metrology"           uri="./disciplines/metrology.ttl"/>

diff --git a/disciplines/catalog-v001.xml b/disciplines/catalog-v001.xml
@@ -17,14 +17,14 @@
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference"                    uri="../reference/reference.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/persholistic"       uri="../reference/persholistic.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/properties"         uri="../reference/properties.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/symbolic"           uri="../reference/symbolic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/information"        uri="../reference/information.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/workflow"           uri="../reference/workflow.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/physicalistic"      uri="../reference/physicalistic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/standardmodel"      uri="../reference/standardmodel.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/standardmodel-full" uri="../reference/standardmodel-full.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/data"               uri="../reference/data.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/agency"             uri="../reference/agency.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines"                     uri="../disciplines/disciplines.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/chemistry"           uri="../disciplines/chemistry.ttl"/>
@@ -40,6 +40,7 @@
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/metrology"           uri="../disciplines/metrology.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/isq"                 uri="../disciplines/isq.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/sysystem"            uri="../disciplines/sisystem.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/properties"         uri="../disciplines/properties.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/units"                         uri="../disciplines/units/units.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/units/sidimensionalunits"      uri="../disciplines/units/sidimensionalunits.ttl"/>

diff --git a/disciplines/metrology.ttl b/disciplines/metrology.ttl
@@ -12,7 +12,7 @@
                                                owl:versionIRI <https://w3id.org/emmo/1.0.0-rc3/disciplines/metrology> ;
                                                owl:imports <https://w3id.org/emmo/1.0.0-rc3/disciplines/math> ,
                                                            <https://w3id.org/emmo/1.0.0-rc3/reference/persholistic> ,
-                                                           <https://w3id.org/emmo/1.0.0-rc3/reference/properties> ,
+                                                           <https://w3id.org/emmo/1.0.0-rc3/disciplines/properties> ,
                                                            <https://w3id.org/emmo/1.0.0-rc3/reference/symbolic> ,
                                                            <https://w3id.org/emmo/1.0.0-rc3/reference/workflow> ;
                                                dcterms:abstract """Defines the formal language of metrology, including theoretical and practical aspects of measurements.

diff --git a/reference/properties.ttl → disciplines/properties.ttl b/reference/properties.ttl → disciplines/properties.ttl
@@ -8,8 +8,8 @@
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @base <https://w3id.org/emmo#> .
 
-<https://w3id.org/emmo/reference/properties> rdf:type owl:Ontology ;
-                                                     owl:versionIRI <https://w3id.org/emmo/1.0.0-rc3/reference/properties> ;
+<https://w3id.org/emmo/disciplines/properties> rdf:type owl:Ontology ;
+                                                     owl:versionIRI <https://w3id.org/emmo/1.0.0-rc3/disciplines/properties> ;
                                                      owl:imports <https://w3id.org/emmo/1.0.0-rc3/perspectives/semiotics> ;
                                                      dcterms:abstract """Defines properties as the result of an observation process. Observation is a semiotic process that stimulate an interpretant within the interpreter who communicates the observed result to other interpreters through a sign, which is the property.
 

diff --git a/disciplines/units/catalog-v001.xml b/disciplines/units/catalog-v001.xml
@@ -16,13 +16,13 @@
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference"                uri="../../reference/reference.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/persholistic"   uri="../../reference/persholistic.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/properties"     uri="../../reference/properties.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/symbolic"       uri="../../reference/symbolic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/information"    uri="../../reference/information.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/workflow"       uri="../../reference/workflow.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/physicalistic"      uri="../../reference/physicalistic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/standardmodel"      uri="../../reference/standardmodel.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/data"               uri="../../reference/data.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/agency"             uri="../../reference/agency.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines"                     uri="../../disciplines/disciplines.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/chemistry"           uri="../../disciplines/chemistry.ttl"/>
@@ -36,6 +36,7 @@
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/metrology"           uri="../../disciplines/metrology.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/isq"                 uri="../../disciplines/isq.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/sisystem"            uri="../../disciplines/sisystem.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/properties"         uri="../../disciplines/properties.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/units"                         uri="../../disciplines/units/units.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/units/sidimensionalunits"      uri="../../disciplines/units/sidimensionalunits.ttl"/>

diff --git a/domain/catalog-v001.xml b/domain/catalog-v001.xml
@@ -15,13 +15,13 @@
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference"                    uri="../reference/reference.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/persholistic"       uri="../reference/persholistic.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/properties"         uri="../reference/properties.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/symbolic"           uri="../reference/symbolic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/information"        uri="../reference/information.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/standardmodel"      uri="../reference/standardmodel.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/standardmodel-full" uri="../reference/standardmodel-full.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/physicalistic"      uri="../reference/physicalistic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/data"               uri="../reference/data.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc3/reference/agency"             uri="../reference/agency.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines"                     uri="../disciplines/disciplines.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/chemistry"           uri="../disciplines/chemistry.ttl"/>
@@ -33,6 +33,7 @@
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/metrology"           uri="../disciplines/metrology.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/isq"                 uri="../disciplines/isq.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/sysystem"            uri="../disciplines/sisystem.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/properties"         uri="../disciplines/properties.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/units"                         uri="../disciplines/units/units.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc3/disciplines/units/sidimensionalunits"      uri="../disciplines/units/sidimensionalunits.ttl"/>