Skip to content

Commit

Permalink
Merge pull request #42 from emmo-repo/dev
Browse files Browse the repository at this point in the history 
dev
  • Loading branch information
@jsimonclark
jsimonclark authored Sep 30, 2024
2 parents 20d3931 + 82e6e96 commit a6b65fc
Show file tree
Hide file tree
Showing 15 changed files with 1,026 additions and 86 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci_tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ jobs:
--skip test_quantity_dimension \
--configfile=.github/utils/emmocheck_config.yml \
batteryquantities.ttl
elif [ -f "modules/quantities.ttl" ]; then
elif [ -f "shared/battery-quantities.ttl" ]; then
emmocheck --verbose --url-from-catalog \
--skip test_namespace \
--skip test_quantity_dimension \
--configfile=.github/utils/emmocheck_config.yml \
modules/quantities.ttl
shared/battery-quantities.ttl
else
echo "batteryquantities.ttl or modules/quantities.ttl not found!"
echo "batteryquantities.ttl or shared/battery-quantities.ttl not found!"
exit 1
fi
8 changes: 4 additions & 4 deletions .github/workflows/doc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ jobs:
if [ -f "batteryquantities.ttl" ]; then
python docs/scripts/apply_foops_recommendations.py batteryquantities.ttl batteryquantities-foops.ttl
sudo cp "batteryquantities-foops.ttl" "docs/_build/html/versions/$TAG/batteryquantities.ttl"
elif [ -f "modules/quantities.ttl" ]; then
python docs/scripts/apply_foops_recommendations.py modules/quantities.ttl quantities-foops.ttl
elif [ -f "shared/battery-quantities.ttl" ]; then
python docs/scripts/apply_foops_recommendations.py shared/battery-quantities.ttl quantities-foops.ttl
sudo cp "quantities-foops.ttl" "docs/_build/html/versions/$TAG/quantities.ttl"
else
echo "File not found!"
Expand All @@ -112,8 +112,8 @@ jobs:
if [ -f "batteryquantities.ttl" ]; then
python docs/scripts/apply_foops_recommendations.py batteryquantities.ttl batteryquantities-foops.ttl
sudo cp "batteryquantities-foops.ttl" "docs/_build/html/batteryquantities.ttl"
elif [ -f "modules/quantities.ttl" ]; then
python docs/scripts/apply_foops_recommendations.py modules/quantities.ttl quantities-foops.ttl
elif [ -f "shared/battery-quantities.ttl" ]; then
python docs/scripts/apply_foops_recommendations.py shared/battery-quantities.ttl quantities-foops.ttl
sudo cp "quantities-foops.ttl" "docs/_build/html/quantities.ttl"
else
echo "battery quantities file not found!"
Expand Down
37 changes: 37 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Ignore virtual environment
.venv/
venv/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
*.manifest
*.spec

# Logs and database files
*.log
*.sqlite3
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ This domain ontology supports the creation of Linked Data in any RDF-supported f
This project has received support from European Union research and innovation programs, under grant agreement numbers:

* [957189 - BIG-MAP](http://www.big-map.eu/)
* [101104022 - Battery2030+](https://battery2030.eu/)
* [101104022 - Battery2030+](https://battery2030.eu/)
* [101103997 - DigiBatt](https://digibattproject.eu/)

## License

Expand Down
68 changes: 7 additions & 61 deletions battery.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
@base <https://w3id.org/emmo/domain/battery/battery> .

<https://w3id.org/emmo/domain/battery/battery> rdf:type owl:Ontology ;
owl:versionIRI <https://w3id.org/emmo/domain/battery/0.13.0-beta/battery> ;
owl:imports <https://w3id.org/emmo/domain/battery/0.13.0-beta/modules/quantities> ,
owl:versionIRI <https://w3id.org/emmo/domain/battery/0.14.0-beta/battery> ;
owl:imports <https://w3id.org/emmo/domain/battery/0.14.0-beta/shared/battery-quantities> ,
<https://w3id.org/emmo/domain/electrochemistry/0.22.0-beta/electrochemistry> ;
dcterms:abstract "The Battery Domain Ontology, a specialized domain within the Elementary Multiperspective Materials Ontology (EMMO), encompasses essential terms and relationships for battery components, cells, interfaces, methods, models, and data. Its primary objective is to enable the creation of linked and FAIR (Findable, Accessible, Interoperable, and Reusable) data, thereby fostering advancements in research and innovation within the realm of batteries. This ontology serves as a foundational resource for harmonizing battery knowledge representation, enhancing data interoperability, and accelerating progress in battery research and development." ;
dcterms:bibliographicCitation "https://zenodo.org/doi/10.5281/zenodo.7693672" ;
Expand All @@ -28,19 +28,19 @@
dcterms:created "2022-11-25"^^xsd:date ;
dcterms:creator <https://orcid.org/0000-0002-8758-6109> ,
<https://orcid.org/0000-0003-2954-1233> ;
dcterms:issued "2024-09-15"^^xsd:date ;
dcterms:issued "2024-09-30"^^xsd:date ;
dcterms:license "https://creativecommons.org/licenses/by/4.0/legalcode" ;
dcterms:modified "2024-09-15"^^xsd:date ;
dcterms:modified "2024-09-30"^^xsd:date ;
dcterms:publisher "EMMO" ;
dcterms:source <https://www.electropedia.org> ;
dcterms:title "Battery Domain Ontology"@en ;
bibo:doi "10.5281/zenodo.7693672" ;
bibo:status "unstable" ;
vann:preferredNamespacePrefix "battery" ;
vann:preferredNamespaceUri "https://w3id.org/emmo/domain/battery" ;
owl:backwardCompatibleWith "0.12.1beta" ;
owl:priorVersion "0.12.1beta" ;
owl:versionInfo "0.13.0-beta" ;
owl:backwardCompatibleWith "0.13.0-beta" ;
owl:priorVersion "0.13.0-beta" ;
owl:versionInfo "0.14.0-beta" ;
foaf:logo "https://raw.githubusercontent.com/emmo-repo/domain-battery/master/docs/assets/img/fig/png/domain-battery-logo.png" .

#################################################################
Expand Down Expand Up @@ -245,12 +245,6 @@
emmo:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "primary battery with a non-aqueous electrolyte, a positive electrode containing carbon monofluoride and a negative electrode of lithium"@en .


### https://w3id.org/emmo/domain/battery#battery_14ea92c1_2682_4c52_83a5_632adcfdb1ce
:battery_14ea92c1_2682_4c52_83a5_632adcfdb1ce rdf:type owl:Class ;
rdfs:subClassOf emmo:EMMO_0f6f0120_c079_4d95_bb11_4ddee05e530e ;
skos:prefLabel "BatteryMeasurementResult"@en .


### https://w3id.org/emmo/domain/battery#battery_14ffa830_2789_429d_8c05_d2ae0ca51732
:battery_14ffa830_2789_429d_8c05_d2ae0ca51732 rdf:type owl:Class ;
owl:equivalentClass [ owl:intersectionOf ( [ rdf:type owl:Restriction ;
Expand Down Expand Up @@ -297,24 +291,6 @@
emmo:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "battery supplied to an original equipment manufacturer (OEM) for use only with or in new equipment."@en .


### https://w3id.org/emmo/domain/battery#battery_1d33b96d_f362_41e5_b670_d33cd6a7ab28
:battery_1d33b96d_f362_41e5_b670_d33cd6a7ab28 rdf:type owl:Class ;
rdfs:subClassOf :battery_6c481323_498b_42c6_915a_53490f409430 ,
[ rdf:type owl:Restriction ;
owl:onProperty emmo:EMMO_ae2d1a96_bfa1_409a_a7d2_03d69e8a125a ;
owl:someValuesFrom :battery_74ed2670_657d_4f0b_b0a6_3f13bc2e9c17
] ,
[ rdf:type owl:Restriction ;
owl:onProperty emmo:EMMO_ae2d1a96_bfa1_409a_a7d2_03d69e8a125a ;
owl:someValuesFrom :battery_bc033b97_a5b7_455c_94ce_e95676cb816b
] ,
[ rdf:type owl:Restriction ;
owl:onProperty emmo:EMMO_c4bace1d_4db0_4cd3_87e9_18122bae2840 ;
owl:someValuesFrom :battery_2198cf67_b5d2_4325_9b6a_dde0a26fd065
] ;
skos:prefLabel "BatteryCycling"@en .


### https://w3id.org/emmo/domain/battery#battery_1d3a2bb3_1d39_4cdb_9a28_c73d663388ab
:battery_1d3a2bb3_1d39_4cdb_9a28_c73d663388ab rdf:type owl:Class ;
owl:equivalentClass [ owl:intersectionOf ( [ rdf:type owl:Restriction ;
Expand Down Expand Up @@ -426,12 +402,6 @@
emmo:EMMO_c84c6752_6d64_48cc_9500_e54a3c34898d "https://en.wikipedia.org/wiki/Calcium_battery"@en .


### https://w3id.org/emmo/domain/battery#battery_2198cf67_b5d2_4325_9b6a_dde0a26fd065
:battery_2198cf67_b5d2_4325_9b6a_dde0a26fd065 rdf:type owl:Class ;
rdfs:subClassOf :battery_14ea92c1_2682_4c52_83a5_632adcfdb1ce ;
skos:prefLabel "BatteryCyclingMeasurementResult"@en .


### https://w3id.org/emmo/domain/battery#battery_22a6f05f_fdc7_4670_830d_c23062c9ba6b
:battery_22a6f05f_fdc7_4670_830d_c23062c9ba6b rdf:type owl:Class ;
rdfs:subClassOf emmo:EMMO_65a007dc_2550_46b0_b394_3346c67fbb69 ,
Expand Down Expand Up @@ -469,13 +439,6 @@
emmo:EMMO_c84c6752_6d64_48cc_9500_e54a3c34898d "https://en.wikipedia.org/wiki/Potassium-ion_battery"@en .


### https://w3id.org/emmo/domain/battery#battery_23e6170d_a70b_4de9_a4db_458e24a327ac
:battery_23e6170d_a70b_4de9_a4db_458e24a327ac rdf:type owl:Class ;
rdfs:subClassOf emmo:EMMO_f2d5d3ad_2e00_417f_8849_686f3988d929 ;
skos:prefLabel "BatteryCycler"@en ;
emmo:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "A device for performing cycling measurements of a battery."@en .


### https://w3id.org/emmo/domain/battery#battery_27e2df40_b85d_4cdb_8469_b3b61b18e4ce
:battery_27e2df40_b85d_4cdb_8469_b3b61b18e4ce rdf:type owl:Class ;
rdfs:subClassOf :battery_74ed2670_657d_4f0b_b0a6_3f13bc2e9c17 ;
Expand Down Expand Up @@ -1013,16 +976,6 @@
emmo:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "alkaline zinc manganese dioxide cylindrical cell in a R6 case"@en .


### https://w3id.org/emmo/domain/battery#battery_6c481323_498b_42c6_915a_53490f409430
:battery_6c481323_498b_42c6_915a_53490f409430 rdf:type owl:Class ;
rdfs:subClassOf emmo:EMMO_463bcfda_867b_41d9_a967_211d4d437cfb ,
[ rdf:type owl:Restriction ;
owl:onProperty emmo:EMMO_c4bace1d_4db0_4cd3_87e9_18122bae2840 ;
owl:someValuesFrom :battery_14ea92c1_2682_4c52_83a5_632adcfdb1ce
] ;
skos:prefLabel "BatteryMeasurement"@en .


### https://w3id.org/emmo/domain/battery#battery_6e8efa8d_ec92_40e7_8013_e5efb4bc654d
:battery_6e8efa8d_ec92_40e7_8013_e5efb4bc654d rdf:type owl:Class ;
rdfs:subClassOf :battery_b572826a_b4e4_4986_b57d_f7b945061f8b ;
Expand Down Expand Up @@ -2267,13 +2220,6 @@
emmo:EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "cell containing a positive electrode with an active material of silver oxide or containing silver oxide"@en .


### https://w3id.org/emmo/domain/battery#battery_d9b99b14_44e8_473b_af8f_2a160429df69
:battery_d9b99b14_44e8_473b_af8f_2a160429df69 rdf:type owl:Class ;
rdfs:subClassOf emmo:EMMO_194e367c_9783_4bf5_96d0_9ad597d48d9a ,
emmo:EMMO_4db96fb7_e9e0_466d_942b_f6f17bfdc145 ;
skos:prefLabel "BatteryTimeSeriesDataSet"@en .


### https://w3id.org/emmo/domain/battery#battery_dae4c0f0_c3eb_4662_a0df_767e02014053
:battery_dae4c0f0_c3eb_4662_a0df_767e02014053 rdf:type owl:Class ;
rdfs:subClassOf :battery_68ed592a_7924_45d0_a108_94d6275d57f0 ,
Expand Down
6 changes: 3 additions & 3 deletions catalog-v001.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<uri id="Imports Wizard Entry" name="https://w3id.org/emmo/domain/electrochemistry/0.22.0-beta/modules/quantities" uri="https://raw.githubusercontent.com/emmo-repo/domain-electrochemistry/0.22.0-beta/modules/quantities.ttl"/>
<uri id="Imports Wizard Entry" name="https://w3id.org/emmo/1.0.0-beta7" uri="https://raw.githubusercontent.com/emmo-repo/EMMO/1.0.0-beta7/emmo.ttl"/>
<group id="Folder Repository, directory=, recursive=true, Auto-Update=false, version=2" prefer="public" xml:base="">
<uri name="https://w3id.org/emmo/domain/battery/0.13.0-beta/battery" uri="./battery.ttl"/>
<uri name="https://w3id.org/emmo/domain/battery/0.13.0-beta/modules/quantities" uri="./modules/quantities.ttl"/>
<uri name="https://w3id.org/emmo/domain/battery/0.13.0-beta/products" uri="./modules/products.ttl"/>
<uri name="https://w3id.org/emmo/domain/battery/0.14.0-beta/battery" uri="./battery.ttl"/>
<uri name="https://w3id.org/emmo/domain/battery/0.14.0-beta/shared/battery-quantities" uri="./shared/battery-quantities.ttl"/>
<uri name="https://w3id.org/emmo/domain/battery/0.14.0-beta/products" uri="./modules/products.ttl"/>

<uri name="https://w3id.org/emmo/domain/chemical-substance/0.8.0-beta/chemical-substance" uri="https://raw.githubusercontent.com/emmo-repo/domain-chemical-substance/main/chemical-substance.ttl"/>
<uri name="https://w3id.org/emmo/domain/characterisation-methodology/chameo" uri="https://raw.githubusercontent.com/emmo-repo/domain-characterisation-methodology/main/chameo.ttl"/>
Expand Down
Loading

0 comments on commit a6b65fc

Please sign in to comment.