Merge branch '1.0.0-rc1' into cd_update_pages

emmo-repo · Apr 30, 2024 · 0e8b452 · 0e8b452
2 parents 768a962 + cf02c76
commit 0e8b452
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/scripts/makeversions.sh b/.github/scripts/makeversions.sh
@@ -93,14 +93,14 @@ while read version name; do
             "$src" "$d/emmo.owl"
     fi
 
-    # Generate inferred ontology
+    # Generate inferred ontology (may fail)
     if $remake || [ ! -f "$d/emmo-inferred.ttl" ]; then
         echo "Generate inferred ontology"
         #ontoconvert -i HermiT -wsa "$d/emmo.ttl" "$d/emmo-inferred.ttl"
-        ontoconvert -w -i HermiT "$d/emmo.ttl" "$d/emmo-inferred.ttl"
+        ontoconvert -w -i HermiT "$d/emmo.ttl" "$d/emmo-inferred.ttl" || true
     fi
     if $remake || [ ! -f "$d/emmo-inferred.owl" ]; then
-        ontoconvert -w "$d/emmo-inferred.ttl" "$d/emmo-inferred.owl"
+        ontoconvert -w "$d/emmo-inferred.ttl" "$d/emmo-inferred.owl" || true
     fi
 
     # Generate renamed ontology

diff --git a/disciplines/catalog-v001.xml b/disciplines/catalog-v001.xml
@@ -12,7 +12,7 @@
         <uri name="https://w3id.org/emmo/1.0.0-rc1/perspectives/persistence"        uri="../perspectives/persistence.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/perspectives/physicalistic"      uri="../perspectives/physicalistic.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/perspectives/standardmodel"      uri="../perspectives/standardmodel.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/perspectives/standardmodel-full"   uri="../perspectives/standardmodel-full.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/perspectives/standardmodel-full" uri="../perspectives/standardmodel-full.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/perspectives/data"               uri="../perspectives/data.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc1/multiperspective"                uri="../multiperspective/multiperspective.ttl"/>
@@ -29,8 +29,8 @@
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/materials"           uri="../disciplines/materials.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/math"                uri="../disciplines/math.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/models"              uri="../disciplines/models.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/perceptual"           uri="../disciplines/perceptual.ttl"/>
-        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/geometrical"           uri="../disciplines/geometrical.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/perceptual"          uri="../disciplines/perceptual.ttl"/>
+        <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/geometrical"         uri="../disciplines/geometrical.ttl"/>
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/periodictable"       uri="../disciplines/periodictable.ttl"/>
 
         <uri name="https://w3id.org/emmo/1.0.0-rc1/disciplines/metrology"           uri="../disciplines/metrology.ttl"/>

diff --git a/disciplines/chemistry.ttl b/disciplines/chemistry.ttl
@@ -10,7 +10,8 @@
 
 <https://w3id.org/emmo/disciplines/chemistry> rdf:type owl:Ontology ;
                                                owl:versionIRI <https://w3id.org/emmo/1.0.0-rc1/disciplines/chemistry> ;
-                                               owl:imports <https://w3id.org/emmo/1.0.0-rc1/disciplines/isq> ;
+                                               owl:imports <https://w3id.org/emmo/1.0.0-rc1/disciplines/perceptual> ,
+                                                           <https://w3id.org/emmo/1.0.0-rc1/disciplines/isq> ;
                                                dcterms:abstract "The chemistry module populates the physicalistic perspective with materials subclasses categorised according to modern applied chemistry."@en ;
                                                dcterms:contributor "Access, DE" ,
                                                                    "Fraunhofer IWM, DE" ,