Skip to content

Commit

Permalink
Merge branch '1.0.0-rc1' into 270-complex-numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
@jesper-friis
jesper-friis authored Jun 3, 2024
2 parents a6baf06 + 4287cde commit c6f6dab
Show file tree
Hide file tree
Showing 64 changed files with 3,912 additions and 3,343 deletions.
6 changes: 6 additions & 0 deletions .github/emmocheck_conf.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
test_namespace:
exceptions:
- manufacturing.EngineeredMaterial

test_quantity_dimension:
exceptions:
- emmo.ModelledQuantitativeProperty
Expand Down Expand Up @@ -40,3 +41,8 @@ test_unit_dimension:
- emmo.SIBaseUnit
- emmo.SIUnitSymbol
- emmo.SIUnit

test_number_of_labels:
exceptions:
- 0.1.Person # foaf:Person
- 0.1.mbox # foaf:mbox
11 changes: 11 additions & 0 deletions .github/expected_redirections.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@ redirections:

https://w3id.org/emmo: https://emmo-repo.github.io/emmo.ttl # ttl file because tests are not from a browser
https://w3id.org/emmo/: https://emmo-repo.github.io/emmo.ttl
https://w3id.org/emmo/turtle: https://emmo-repo.github.io/emmo.ttl
https://w3id.org/emmo/turtle/: https://emmo-repo.github.io/emmo.ttl
https://w3id.org/emmo/inferred: https://emmo-repo.github.io/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/1.0.0-beta5/: https://emmo-repo.github.io/versions/1.0.0-beta5/emmo.ttl
https://w3id.org/emmo/1.0.0-rc1: https://emmo-repo.github.io/versions/1.0.0-rc1/emmo.ttl
https://w3id.org/emmo/1.0.0-rc1/: https://emmo-repo.github.io/versions/1.0.0-rc1/emmo.ttl
https://w3id.org/emmo/1.0.0-rc1/turtle: https://emmo-repo.github.io/versions/1.0.0-rc1/emmo.ttl
https://w3id.org/emmo/1.0.0-rc1/turtle/: https://emmo-repo.github.io/versions/1.0.0-rc1/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
Expand All @@ -39,6 +45,11 @@ redirections:
https://w3id.org/emmo/1.0.0-beta5/perspectives/data/: https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta5/perspectives/data.ttl


# EMMO-LITE
#https://w3id.org/emmo/emmo-lite: https://raw.githubusercontent.com/emmo-repo/EMMO-LITE/master/emmo-lite.ttl
#https://w3id.org/emmo/1.0.0-rc1/emmo-lite: https://raw.githubusercontent.com/emmo-repo/EMMO-LITE/1.0.0-rc1/emmo-lite.ttl


# Electrochemistry
#https://w3id.org/emmo/domain/electrochemistry#frag: https://emmo-repo.github.io/domain-electrochemistry/electrochemistry.ttl#frag

Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/cd_update_pages.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,16 @@ jobs:
run: |
# Do not overwrite index.html
rm public/index.html
cp -rf public/* pages/.
# Tell GitHub that this site is not generated with jekyll
touch public/.nojekyll
# Copy to latest (root)
cp -rf public/* pages/.
# Copy to version
VERSION=$(git rev-parse --abbrev-ref HEAD)
if [ ! -d pages/versions/${VERSION} ]; then \
mkdir pages/versions/${VERSION}
fi
cp -rf public/* pages/versions/${VERSION}/.
# Domain repositories can use peaceiris/actions-gh-pages@v3.
# However, since EMMO for historical reasons uses a separate repo
Expand Down
4 changes: 4 additions & 0 deletions catalog-v001.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<group id="Folder Repository, directory=, recursive=true, Auto-Update=false, version=2" prefer="public" xml:base="">

<uri name="https://w3id.org/emmo/1.0.0-rc1" uri="./emmo.ttl"/>
<uri name="https://w3id.org/emmo/1.0.0-rc1/contributors" uri="./contributors.ttl"/>

<uri name="https://w3id.org/emmo/1.0.0-rc1/mereocausality" uri="./mereocausality/mereocausality.ttl"/>

<uri name="https://w3id.org/emmo/1.0.0-rc1/perspectives" uri="./perspectives/perspectives.ttl"/>
Expand Down
119 changes: 119 additions & 0 deletions contributors.ttl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix dct: <http://purl.org/dc/terms/> .
@prefix locn: <http://www.w3.org/ns/locn#> .
@prefix skos: <http://www.w3.org/2004/02/skos/core#> .


#################################################################
# Individuals
#################################################################


# People
# ======

### https://orcid.org/0000-0003-3805-8761
<https://orcid.org/0000-0003-3805-8761> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Emanuele Ghedini" ;
foaf:name "Emanuele Ghedini" ;
foaf:workplaceHomepage <https://www.unibo.it/en/> .


### https://orcid.org/0000-0002-1560-809X
<https://orcid.org/0000-0002-1560-809X> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Jesper Friis" ;
foaf:name "Jesper Friis" ;
foaf:workplaceHomepage <https://www.sintef.no/en/> .


### https://orcid.org/0000-0002-4181-2852
<https://orcid.org/0000-0002-4181-2852> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Gerhard Goldbeck" ;
foaf:name "Gerhard Goldbeck" ;
foaf:workplaceHomepage <https://materialsmodelling.com/> .


### https://orcid.org/0000-0003-0514-9229
<https://orcid.org/0000-0003-0514-9229> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Adham Hashibon" ;
foaf:name "Adham Hashibon" ;
foaf:workplaceHomepage <https://www.ucl.ac.uk/> .


### https://orcid.org/0000-0003-4065-9742
<https://orcid.org/0000-0003-4065-9742> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Georg J. Schmitz" ;
foaf:name "Georg J. Schmitz" .


### https://orcid.org/0009-0007-5850-6628
<https://orcid.org/0009-0007-5850-6628> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Anne de Baas" ;
foaf:name "Anne de Baas" ;
foaf:workplaceHomepage <https://materialsmodelling.com/> .


### https://orcid.org/0009-0008-8009-5009
<https://orcid.org/0009-0008-8009-5009> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Francesco A. Zaccarini" ;
foaf:name "Francesco A. Zaccarini" ;
foaf:workplaceHomepage <https://www.unibo.it/en/> .


### https://orcid.org/0000-0001-9189-2400
<https://orcid.org/0000-0001-9189-2400> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Sebastiano Moruzzi" ;
foaf:name "Sebastiano Moruzzi" ;
foaf:workplaceHomepage <https://www.unibo.it/en/> .


### https://orcid.org/0000-0001-8869-3718
<https://orcid.org/0000-0001-8869-3718> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Francesca Lønstad Bleken" ;
foaf:name "Francesca Lønstad Bleken" ;
foaf:workplaceHomepage <https://www.sintef.no/en/> .


### https://orcid.org/0000-0002-8758-6109
<https://orcid.org/0000-0002-8758-6109> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Simon Clark" ;
foaf:name "Simon Clark" ;
foaf:workplaceHomepage <https://www.sintef.no/en/> .


### https://orcid.org/0000-0001-7815-6636
<https://orcid.org/0000-0001-7815-6636> rdf:type owl:NamedIndividual ,
foaf:Person ;
skos:prefLabel "Otello M. Roscioni" ;
foaf:name "Otello M. Roscioni" ;
foaf:workplaceHomepage <https://materialsmodelling.com/> .


# Organisations
# =============

### https://emmc.eu
<https://emmc.eu> rdf:type owl:NamedIndividual , foaf:Organization ;
skos:prefLabel "EMMC ASBL" ;
foaf:name "EMMC ASBL" ;
locn:fullAddress """EMMC ASBL
European Materials Modelling Council
Silversquare Stéphanie
Avenue Louise 54
1050 Brussels
CBE no: 0731 621 312"""@en ;
foaf:logo <https://emmo-repo.github.io/emmc.png> ;
foaf:mbox <mailto:[email protected]> .
2 changes: 2 additions & 0 deletions disciplines/catalog-v001.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<group id="Folder Repository, directory=, recursive=true, Auto-Update=false, version=2" prefer="public" xml:base="">

<uri name="https://w3id.org/emmo/1.0.0-rc1/contributors" uri="../contributors.ttl"/>

<uri name="https://w3id.org/emmo/1.0.0-rc1/mereocausality" uri="../mereocausality/mereocausality.ttl"/>

<uri name="https://w3id.org/emmo/1.0.0-rc1/perspectives" uri="../perspectives/perspectives.ttl"/>
Expand Down
26 changes: 6 additions & 20 deletions disciplines/chemistry.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,14 @@
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" ,
"Goldbeck Consulting Ltd, UK" ,
"SINTEF, NO" ,
"University of Bologna, IT" ;
dcterms:creator "Adham Hashibon" ,
"Emanuele Ghedini" ,
"Georg Schmitz" ,
"Gerhard Goldbeck" ,
"Jesper Friis" ;
dcterms:creator <https://orcid.org/0000-0003-3805-8761> ,
<https://orcid.org/0000-0002-4181-2852> ,
<https://orcid.org/0000-0002-1560-809X> ;
dcterms:license "https://creativecommons.org/licenses/by/4.0/legalcode" ;
dcterms:publisher "EMMC ASBL" ;
dcterms:publisher <https://emmc.eu> ;
dcterms:title "Chemistry"@en ;
rdfs:comment """Contacts:
Gerhard Goldbeck
Goldbeck Consulting Ltd (UK)
email: [email protected]
Emanuele Ghedini
University of Bologna (IT)
email: [email protected]"""@en ,
"The EMMO requires FacT++ reasoner plugin in order to visualize all inferences and class hierarchy (ctrl+R hotkey in Protege)."@en ;
:EMMO_1246b120_abbe_4840_b0f8_3e4348b24a17 "[email protected]" ;
rdfs:comment "The EMMO requires FacT++ reasoner plugin in order to visualize all inferences and class hierarchy (ctrl+R hotkey in Protege)."@en ;
owl:versionInfo "1.0.0-rc1" .

#################################################################
Expand Down
24 changes: 12 additions & 12 deletions disciplines/computerscience.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<https://w3id.org/emmo/1.0.0-rc1/multiperspective/workflow> ,
<https://w3id.org/emmo/1.0.0-rc1/perspectives/semiotics> ;
dcterms:abstract "Key concepts from the domain of computer science."@en ;
dcterms:creator "Emanuele Ghedini, University of Bologna, IT" ,
"Francesca L. Bleken, SINTEF, NO" ,
"Gerhard Goldbeck, Goldbeck Consulting Ltd, UK" ,
"Jesper Friis (SINTEF, NO)" ,
"Otello M. Roscioni, Goldbeck Consulting Ltd, UK" ;
dcterms:contributor <https://orcid.org/0000-0001-7815-6636> ,
<https://orcid.org/0000-0001-8869-3718> ;
dcterms:creator <https://orcid.org/0000-0002-1560-809X> ,
<https://orcid.org/0000-0002-4181-2852> ,
<https://orcid.org/0000-0003-3805-8761> ;
dcterms:license "https://creativecommons.org/licenses/by/4.0/legalcode" ;
dcterms:publisher "EMMC ASBL" ;
dcterms:publisher <https://emmc.eu> ;
dcterms:title "Computer science"@en ;
rdfs:comment "The EMMO requires HermiT reasoner plugin in order to visualize all inferences and class hierarchy (ctrl+R hotkey in Protege)."@en ;
owl:versionInfo "1.0.0-rc1" ;
Expand All @@ -38,14 +38,14 @@ owl:qualifiedCardinality rdf:type owl:AnnotationProperty .
# Datatypes
#################################################################

### http://www.w3.org/1999/02/22-rdf-syntax-ns#JSON
rdf:JSON rdf:type rdfs:Datatype .


### http://www.w3.org/1999/02/22-rdf-syntax-ns#HTML
rdf:HTML rdf:type rdfs:Datatype .


### http://www.w3.org/1999/02/22-rdf-syntax-ns#JSON
rdf:JSON rdf:type rdfs:Datatype .


#################################################################
# Object Properties
#################################################################
Expand Down Expand Up @@ -592,8 +592,8 @@ C:\\\\Users\\\\John\\\\Desktop (DOS-like path)"""@en ;
rdfs:subClassOf :EMMO_3ab914c1_5d8d_4a6e_804b_84aa89623c48 ;
skos:example "Tritium, XSLT, XQuery, STX, FXT, XDuce, CDuce, HaXml, XMLambda, FleXML"@en ;
skos:prefLabel "TransformationLanguage"@en ;
:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "A construction language designed to transform some input text in a certain formal language into a modified output text that meets some specific goal."@en ,
"https://en.wikipedia.org/wiki/Transformation_language"^^xsd:anyURI .
:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "A construction language designed to transform some input text in a certain formal language into a modified output text that meets some specific goal."@en ;
:EMMO_c84c6752_6d64_48cc_9500_e54a3c34898d "https://en.wikipedia.org/wiki/Transformation_language"^^xsd:anyURI .


### https://w3id.org/emmo#EMMO_f42a0e95_c130_4a69_9660_6bfdbb897d4a
Expand Down
21 changes: 20 additions & 1 deletion disciplines/disciplines.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<https://w3id.org/emmo/1.0.0-rc1/disciplines/periodictable> ,
<https://w3id.org/emmo/1.0.0-rc1/disciplines/geometrical> ,
<https://w3id.org/emmo/1.0.0-rc1/disciplines/perceptual> ,
<https://w3id.org/emmo/1.0.0-rc1/disciplines/sisystem> .
<https://w3id.org/emmo/1.0.0-rc1/disciplines/sisystem> ;

# Imported via sisystem
# <https://w3id.org/emmo/1.0.0-rc1/disciplines/units/sidimensionalunits> ,
Expand All @@ -41,4 +41,23 @@
# <https://w3id.org/emmo/1.0.0-rc1/disciplines/prefixedunits> ,
# <https://w3id.org/emmo/1.0.0-rc1/disciplines/deprecated> ,

dcterms:abstract """EMMO disciplines is a container for the EMMO discipline level ontologies.
Discipline level ontologies are reference ontologies that does not cover the whole world."""@en ;
dcterms:contributor <https://orcid.org/0000-0002-8758-6109> ,
<https://orcid.org/0000-0001-8869-3718> ,
<https://orcid.org/0009-0007-5850-6628> ;
dcterms:creator <https://orcid.org/0000-0003-0514-9229> ,
<https://orcid.org/0000-0003-3805-8761> ,
<https://orcid.org/0000-0003-4065-9742> ,
<https://orcid.org/0000-0002-4181-2852> ,
<https://orcid.org/0000-0002-1560-809X> ;
dcterms:license "https://creativecommons.org/licenses/by/4.0/legalcode" ;
dcterms:publisher <https://emmc.eu> ;
dcterms:title "EMMO discipline-level ontology"@en ;
:EMMO_1246b120_abbe_4840_b0f8_3e4348b24a17 "[email protected]" ;
rdfs:comment "The EMMO requires HermiT reasoner plugin in order to visualize all inferences and class hierarchy (ctrl+R hotkey in Protege)."@en ;
owl:versionInfo "1.0.0-rc1" .


### Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
Loading

0 comments on commit c6f6dab

Please sign in to comment.