From 0e8d923fec62bd6047147d8b2d8f60b32f6c2677 Mon Sep 17 00:00:00 2001 From: David Linke Date: Mon, 29 Apr 2024 16:32:50 +0200 Subject: [PATCH] Fix "catalyst bed" relations & README improvement (#75) * Catalyst bed is no reactor type * README improvements --- README.md | 13 ++++++++----- vocabularies/voc4cat/0005009.ttl | 2 ++ vocabularies/voc4cat/0007020.ttl | 2 +- vocabularies/voc4cat/0007036.ttl | 4 +--- vocabularies/voc4cat/concept_scheme.ttl | 3 ++- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3393fd4..f2461f9 100644 --- a/README.md +++ b/README.md @@ -73,26 +73,29 @@ To discuss about the **voc4cat**-vocabulary maintained here, create an [issue](h To contribute new concepts or collections or change existing ones, you may either submit your contributions as Excel/xlsx-file or (as an expert) as new/changed turtle file. -> Small contributions like adding a single concept are as valuable as bigger ones. -> In fact if you plan a bigger change (50+ concepts), consider splitting up the additions/changes into smaller chunks with max. ~25 changes to make the review process not too hard for the reviewers and you as author. +> Small contributions like adding a single concept are as valuable as bigger ones. +> In fact if you plan a bigger change (50+ concepts), consider splitting up the additions/changes into smaller chunks with max. ~20 changes to make the review process not too hard for the reviewers and you as author. Here are the steps for submitting updates via Excel/xlsx. - Get the Excel/xlsx-vocabulary file - The most recent version of the vocabulary is always available via GitHub-pages https://nfdi4cat.github.io/voc4cat/dev/voc4cat.xlsx - Make changes to the Excel file. If you want to add something new you need to [request a range of IDs](https://github.com/nfdi4cat/voc4cat/issues/new/choose) for you. -- Add the xlsx file to your clone of the repository into the folder `inbox-excel-vocabs` +- Create a fork of the voc4cat repository (if you don't yet have one) or pull the latest changes to your fork (via "Sync fork" button in GUI). +- Create a feature branch for your contribution (via GitHub GUI or `git switch -c name-of-branch`) + - Add the xlsx file to the feature branch into the folder `inbox-excel-vocabs` - The name of the file must match the vocabulary that you want to update. So do not change the filename, but keep `voc4cat.xlsx`. - Create a pull request with the updated Excel-file in this repository. - Please describe your changes and the motivation for the changes in the pull request note or link to an issue with this information. This will help reviewers to understand the proposed change and decide about it. -- Your pull request will be processed automatically by a CI/CD pipeline that typically runs less than a minute. +- Your pull request will be processed automatically by a CI/CD pipeline that typically finishes in less than a minute. - Review the artifacts/logs generated by the CI pipeline. - The [workflow artifact](https://docs.github.com/en/actions/managing-workflow-runs/downloading-workflow-artifacts) will contain an updated xlsx file that is recreated from the updated turtle-file. - If all is good your contribution will be either - directly merged by the maintainers - or a discussion will be started about what else is needed - or why the proposed change may not fit. -- If you need to fix something update the pull request branch. This will trigger the pipeline to run again. +- If you need to fix something, commit further changes to the pull request branch in your clone. + - If any commits have been made by the CI pipeline, pull the changes to your repo (via "Sync fork" button in GUI) before committing any additional changes. Finally, when the proposed pull request is accepted, your changes will be integrated in the vocabularies in the folder `vocabularies`. The vocabularies are stored in split form using one folder per vocabulary. diff --git a/vocabularies/voc4cat/0005009.ttl b/vocabularies/voc4cat/0005009.ttl index a5b7b31..0f46df1 100644 --- a/vocabularies/voc4cat/0005009.ttl +++ b/vocabularies/voc4cat/0005009.ttl @@ -1,10 +1,12 @@ PREFIX dcterms: +PREFIX rdfs: PREFIX skos: PREFIX xsd: a skos:Concept ; dcterms:identifier "voc4cat_0005009"^^xsd:token ; + rdfs:isDefinedBy ; skos:altLabel "formation rate"@en ; skos:definition "Is a quantity describing how fast a product is formed in a chemical reaction. It is defined by the amount of product formed per unit of time."@en ; skos:historyNote "0000-0002-5898-1820 David Linke created the resource"@en ; diff --git a/vocabularies/voc4cat/0007020.ttl b/vocabularies/voc4cat/0007020.ttl index 78b3d9f..a5d1311 100644 --- a/vocabularies/voc4cat/0007020.ttl +++ b/vocabularies/voc4cat/0007020.ttl @@ -5,10 +5,10 @@ PREFIX xsd: a skos:Concept ; dcterms:identifier "voc4cat_0007020"^^xsd:token ; - skos:broader ; skos:definition "The part of the reactor where the catalyst is located, characterized by length, diameter, volume."@en ; skos:historyNote "0000-0002-4041-0165 Julia Schumann created the resource"@en ; skos:inScheme ; skos:prefLabel "catalyst bed"@en ; + skos:topConceptOf ; . diff --git a/vocabularies/voc4cat/0007036.ttl b/vocabularies/voc4cat/0007036.ttl index 2cf0c37..c1af0d0 100644 --- a/vocabularies/voc4cat/0007036.ttl +++ b/vocabularies/voc4cat/0007036.ttl @@ -11,9 +11,7 @@ PREFIX xsd: skos:definition "A chemical reactor in which the reaction is carried out in the presence of a catalyst."@en ; skos:historyNote "0000-0002-4041-0165 Julia Schumann created the resource"@en ; skos:inScheme ; - skos:narrower - , - ; + skos:narrower ; skos:prefLabel "catalytic reactor"@en ; . diff --git a/vocabularies/voc4cat/concept_scheme.ttl b/vocabularies/voc4cat/concept_scheme.ttl index bf9459f..be49891 100644 --- a/vocabularies/voc4cat/concept_scheme.ttl +++ b/vocabularies/voc4cat/concept_scheme.ttl @@ -12,7 +12,7 @@ PREFIX xsd: , ; dcterms:identifier "voc4cat_"^^xsd:token ; - dcterms:modified "2024-03-09"^^xsd:date ; + dcterms:modified "2024-04-08"^^xsd:date ; dcterms:publisher ; owl:versionInfo "automatic" ; skos:definition "A vocabulary for all areas of catalysis initiated in NFDI4Cat. Starting with photocatalysis we add more and more terms from other areas of catalysis and related disciplines like chemical engineering or materials science."@en ; @@ -35,6 +35,7 @@ PREFIX xsd: , , , + , , , ,