Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

117 Emodule mapping script #118

Closed
wants to merge 184 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
184 commits
Select commit Hold shift + click to select a range
b9401bd
upload emodule ontology extracted from CPTO w/ placeholders
Feb 9, 2023
6c83109
edited mapping script for the emodul
Feb 13, 2023
56d1c59
edited a spelling mistake (Vlaue instead of Value) in a placeholder f…
Feb 14, 2023
12a811a
changed metadata key-names to fit the ontology placeholders
Feb 14, 2023
71fa0d1
added ID generator and improved logging
Feb 16, 2023
393b1db
undid changes to testing path
Feb 16, 2023
25c5518
commented out testing code that made tests fail
Feb 16, 2023
df882c0
added mapping for parameters width and height
Feb 23, 2023
2fb44c8
removed useless counter
Feb 27, 2023
77fad67
changed transducer column to string
Feb 27, 2023
2362dd5
changed transducer column to list and processed path
Feb 27, 2023
b297c4f
fixed testing path
Feb 27, 2023
f4cecfd
edited mapping script, appending ID
Feb 27, 2023
c78ae7f
now correctly appending ID and simplyfy placeholders
Feb 28, 2023
47bb434
commented out personal testing code, will be deleted later before mer…
Feb 28, 2023
ede2139
changed key for specimen name
Mar 7, 2023
1e22396
updated mapping script
Mar 9, 2023
73e764e
rewrite unittest to make it compatible with the new emodule mapping s…
soudehMasoudian Mar 22, 2023
9cef338
Merge branch 'main' into 117-e-module-mapping-script
Mar 30, 2023
f426b99
trying to resolve conflicts by updating manually emod ttl
Mar 30, 2023
d6b3886
delte old drawio to resolve conflict
Mar 30, 2023
3d1c540
Add files via upload
mattheokru Apr 3, 2023
906e826
Update README.md
mattheokru Apr 3, 2023
b9fc13d
Delete CPTO.drawio
mattheokru Apr 3, 2023
28359f5
Delete ConcreteProductionAndTestingOntology.drawio
mattheokru Apr 3, 2023
0209d2d
Add files via upload
mattheokru Apr 3, 2023
9958a5e
Delete EModuleOntology.drawio.xml
mattheokru Apr 3, 2023
4e9b566
Delete EModuleOntology.ttl
mattheokru Apr 3, 2023
08d56d0
Add files via upload
mattheokru Apr 3, 2023
308c3ff
Delete MixtureDesignOntology.drawio.xml
mattheokru Apr 3, 2023
3c6aef6
Delete MixtureDesignOntology.ttl
mattheokru Apr 3, 2023
ce22824
Add files via upload
mattheokru Apr 3, 2023
0c063e6
Rename CPTO.drawio to ConcreteProductionandTestingOntology.drawio
mattheokru Apr 3, 2023
d199397
Rename ConcreteProductionandTestingOntology.drawio to ConcreteProduct…
mattheokru Apr 3, 2023
0cdd574
changed metadata emodul test to match the metadata extraction
Apr 4, 2023
d1dd55b
resolve issue after merging main
Apr 4, 2023
af12f09
commented out line in test that caused error
Apr 4, 2023
f529d58
comment rdflib parsing as it caused exception and we dont need it any…
soudehMasoudian Apr 4, 2023
efa554c
Rename CompressiveStrengthOntology.ttl to CompressiveStrengthKnowledg…
mattheokru Apr 4, 2023
0b5b470
Rename EModuleOntology.ttl to EModuleKnowledgeGraph.ttl
mattheokru Apr 4, 2023
abf3c7e
Rename HardeningStorageOntology.ttl to HardeningStorageKnowledgeGraph…
mattheokru Apr 4, 2023
d5ae272
Rename HeatOfHydrationOntology.ttl to HeatOfHydrationKnowledgeGraph.ttl
mattheokru Apr 4, 2023
53b359a
Rename MixingProcessOntology.ttl to MixingProcessKnowledgeGraph.ttl
mattheokru Apr 4, 2023
ae256c1
Rename MixtureDesignOntology.ttl to MixtureDesignKnowledgeGraph.ttl
mattheokru Apr 4, 2023
024bbfb
Delete pmdco_core.ttl
mattheokru Apr 4, 2023
acceef9
Updated pmd core
mattheokru Apr 4, 2023
fa06108
Not neccesary anymore
mattheokru Apr 4, 2023
a693615
removed code to transform units of length
Apr 12, 2023
5b6c3b1
changed the term ontology to kg template and removed temporary testin…
Apr 12, 2023
453d75d
fix terminology (replace onto with kg)
Apr 12, 2023
54af803
updated testing script of metadata extraction
Apr 12, 2023
45c41c1
change the query to filter and return predicates contain str
soudehMasoudian Apr 13, 2023
eeae7a6
trying to fix test
Apr 18, 2023
0f6a462
fixing emod-metadata extr testing script
Apr 18, 2023
5609aa5
renamed e-module-mapping and made it generic for all mapping
Apr 25, 2023
1ffc1f1
adjusted file for renamed mapping script
Apr 25, 2023
5fa554d
trying to fix paths in metadata test
Apr 25, 2023
dbdb6bd
Updated Ontologies and added extra Specimen Ontology
mattheokru Apr 26, 2023
5269854
Updated the Specimen Ontology
mattheokru Apr 26, 2023
67b07c1
Merge 'main' into updating-CPTO for coverage
Apr 27, 2023
9aa48da
Merge branch 'updating-CPTO' into 117-e-module-mapping-script to work…
Apr 27, 2023
7e92158
changed extraction script to generate seperate yaml file for specimen
Apr 27, 2023
5b25f9d
now generating two yaml files
Apr 27, 2023
efc7400
adding unit conversion function
May 2, 2023
9a6134b
fixed error in unit conversion
May 2, 2023
9e2ee21
adding units to extraction script
May 2, 2023
ae3f4b5
added more units to metadata-extraction
May 9, 2023
7501502
description change
May 9, 2023
b6b292a
added instructions of what to do while I'm gone
May 9, 2023
68ba171
adjusted the Experiment Date Time as discussed in the unit issue
May 9, 2023
b7aaa6b
added mixDesign metadata extraction script, missing proper Units still
May 9, 2023
ce2f754
Update unit_conversion.py
AidaZt May 26, 2023
5d768c0
Updated KG's
mattheokru May 31, 2023
ec718a2
uploaded CPTO
mattheokru May 31, 2023
eb9f9b2
fixed spelling
mattheokru May 31, 2023
e09f57b
rename the test output file
Jun 1, 2023
5361881
import ID from mixdesign and save to specimen and emodule metadata
Jun 1, 2023
fe40f02
fixed exception message
Jun 1, 2023
15624c4
Update unit_conversion.py
AidaZt Jun 1, 2023
158e238
Add files via upload
AidaZt Jun 1, 2023
d868a55
Update unit_URI.json
AidaZt Jun 1, 2023
d9e8603
added units
Jun 1, 2023
0ab0589
ID reading
Jun 1, 2023
6a94760
Merge branch '117-e-module-mapping-script' of github.com:BAMresearch/…
Jun 1, 2023
ac4bf21
added default argument to function
Jun 5, 2023
a8f201a
specified metadata location
Jun 5, 2023
2db3553
included ID and humanreadableID
mattheokru Jun 5, 2023
731ae86
added human readable and machine readable ID
Jun 5, 2023
780c56e
added human readable and machine readable ID for both specimen and em…
Jun 5, 2023
3ba9eb4
uploaded ttl files
mattheokru Jun 7, 2023
b39a5f0
added files via upload
mattheokru Jun 7, 2023
7d24e15
added human readable ID
Jun 13, 2023
53ac95d
save datetime in correct format for protege
Jun 13, 2023
1a37477
fixed the format of datetime
Jun 13, 2023
ca662fa
Merge branch 'Knowledge_Graphs_Update' into 117-e-module-mapping-script
Jun 13, 2023
2329807
change the location of the files for HeatOfHydration
AidaZt Jun 13, 2023
56f68a0
Delete usecases/demonstrator/ExperimentData/Examples/processed_data d…
AidaZt Jun 13, 2023
fdb0c56
Delete calo_example.csv
AidaZt Jun 13, 2023
af07fe8
Delete extractor.py
AidaZt Jun 13, 2023
d175a80
updated EModule
mattheokru Jun 14, 2023
a4a8b12
updated SpecimenKG and added new ConcreteOntology
mattheokru Jun 14, 2023
f94a8a9
update emodule kg
mattheokru Jun 14, 2023
beab744
updated mapping script but no unit mapping yet
Jun 16, 2023
2e653a3
merging KG updates into branch
Jun 16, 2023
83f7c86
renamed labels to match the KG template
Jun 16, 2023
85dd118
added humanreadable ID
mattheokru Jun 19, 2023
dc743cd
update Compressive Strength
mattheokru Jun 19, 2023
cc27b44
update
mattheokru Jun 19, 2023
2bd15e8
updates
mattheokru Jun 19, 2023
3a11380
read metadata ID to append instead of creating ID
Jun 20, 2023
c006854
Merge branch 'Knowledge_Graphs_Update' into 117-e-module-mapping-script
Jun 20, 2023
1253c58
added hardcoded extensometer length
Jun 20, 2023
aa9c516
fixed unit labels
Jun 20, 2023
70d686d
added unit mapping
Jun 20, 2023
360e13b
delete wrong KGs
Jun 20, 2023
98c5134
Added correct up to date KGs
alFrie Jun 20, 2023
62c8dcd
update unit_URI
AidaZt Jun 20, 2023
2ae45e8
commented out information that is not needed now for mapping
Jun 20, 2023
d97a891
edited unit mapping
Jun 20, 2023
27bc85d
changed mix extraction to match KG
Jun 20, 2023
a78c91a
added addition extraction
Jun 21, 2023
1b1422d
mixture_design update
mattheokru Jun 21, 2023
b6193d7
Merge branch 'Knowledge_Graphs_Update' into 117-e-module-mapping-scri…
Jun 28, 2023
7675692
switched from yaml to json in extraction in mapping scripts
Jun 28, 2023
f4750b4
changes to match the mixture KG
Jun 28, 2023
cc8d08a
Added new Mixtures via Upload
alFrie Jun 28, 2023
aab510b
modified Heat of Hydration extraction and processed data directory
Jul 11, 2023
9450eea
deleted data file from script directory
Jul 17, 2023
2368c28
updated gitignore
Jul 17, 2023
844c93a
Import_gui
AidaZt Jul 17, 2023
d3a027b
added workflow for PMD demonstrator meeting
Jul 17, 2023
37c54a5
updated workflow, containing now also mapping
Jul 17, 2023
61ba28e
Update import_gui.py
mattheokru Jul 17, 2023
ed939a3
updated the documentation
Jul 18, 2023
d0e9442
added possibility to have 2 additions
Jul 18, 2023
b56210b
changed documentation
Jul 18, 2023
667df28
Update import_gui.py
mattheokru Jul 19, 2023
5e89a8c
update GUI and Workflow
AidaZt Jul 24, 2023
6de946e
update GUI and Workflow
AidaZt Jul 24, 2023
4f0e465
web test
mattheokru Jul 26, 2023
152c861
Merge branch '117-e-module-mapping-script' of https://github.com/BAMr…
mattheokru Jul 26, 2023
75f3eb5
Update main.py
mattheokru Jul 26, 2023
9e9726f
update workflow
AidaZt Jul 27, 2023
4acd724
save output in path_to_json
AidaZt Jul 27, 2023
53fea19
add path_to_json from mix to store Mixdesign ID to specimen metadata
AidaZt Jul 27, 2023
24da85b
Create Plot.py
mattheokru Aug 9, 2023
880aaee
Update workflow
AidaZt Aug 11, 2023
52c67e1
Delete lebedigital/demonstrator_scripts/Demonstration_PMD directory
AidaZt Aug 11, 2023
57f3428
update workflow
AidaZt Aug 29, 2023
b9b6c43
directory for emodule metadata
AidaZt Aug 29, 2023
0b1ccf6
Delete processed_data.csv
AidaZt Aug 29, 2023
c97517d
directory for emodule metadata
AidaZt Aug 29, 2023
4d79052
directory for emodule metadata
AidaZt Aug 29, 2023
ff52a38
directory for emodule metadata
AidaZt Aug 29, 2023
ce53359
directory for Mix metadata
AidaZt Aug 29, 2023
4c7dedd
Update README.md
mattheokru Sep 28, 2023
01d2bbf
deleted old Ontologies
mattheokru Sep 28, 2023
1bf4d2d
updated KGs
mattheokru Sep 28, 2023
5993b25
Compressive strength rawdata processing
AidaZt Oct 23, 2023
7af53f2
Update emodul_metadata_extraction.py
AidaZt Oct 24, 2023
17e82ae
Update mixdesign_metadata_extraction.py
AidaZt Oct 24, 2023
71da752
Update emodul_metadata_extraction.py
AidaZt Oct 24, 2023
04359c9
update KG Template
mattheokru Oct 25, 2023
cd9eae8
Update mappingscript.py
AidaZt Oct 25, 2023
fe8f063
delete ID
mattheokru Oct 25, 2023
1219ff8
spelling
mattheokru Nov 1, 2023
76418b7
update compressive strength
mattheokru Nov 3, 2023
385ec3f
Update ComSt_metadata_extraction.py
AidaZt Nov 9, 2023
78387fe
Update ComSt_generate_processed_data.py
AidaZt Nov 9, 2023
bd2e1be
Delete usecases/MinimumWorkingExample/Demonstration_PMD/MergedGraph.ttl
AidaZt Nov 9, 2023
75d6eb4
Update import_gui.py
AidaZt Nov 9, 2023
5c251ab
Update workflow.py
AidaZt Nov 9, 2023
9592e7b
Update environment.yml
AidaZt Nov 9, 2023
d93b0e7
Update test_mixture_metadata_extraction.py
AidaZt Nov 9, 2023
c902a15
Update test_mixture_metadata_extraction.py
AidaZt Nov 9, 2023
c11c0e8
Update test_mixture_metadata_extraction.py
AidaZt Nov 10, 2023
2c43937
Delete usecases/MinimumWorkingExample/mixture/metadata_json_files/201…
AidaZt Nov 10, 2023
4c9edee
Mix_json_files directory
AidaZt Nov 10, 2023
97bb847
Update test_mixture_metadata_extraction.py
AidaZt Nov 10, 2023
c9240f3
deleted numeration on mixture
mattheokru Nov 10, 2023
f55a2e2
Update MixtureDesign_KG_Template.ttl
AidaZt Nov 13, 2023
db16eaf
Uploaded Pittrich Data and Hüsken Mix
mattheokru Nov 17, 2023
351c3d4
update
mattheokru Nov 22, 2023
352a7ef
Update testMetaData.json
AidaZt Nov 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ dmypy.json
# results of minimum working example
usecases/MinimumWorkingExample/emodul/*
usecases/MinimumWorkingExample/mixture/*
usecases/MinimumWorkingExample/Mapping_Example/*

# graphviz
*.gv
Expand Down
8 changes: 4 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ dependencies:
- docker-compose
- cython
- numpy
- pandas
- pandas=2.0.3
- pyyaml
- owlready2
- rdflib
- rdflib=6
- sparqlwrapper
- requests
- gitpython
Expand All @@ -32,13 +32,13 @@ dependencies:
- pint=0.20
- pint-pandas
- snakemake
- pybis
- pybis=1.35.5
- xlsxwriter
- termcolor
- sphinx
- pytest-cov
- codecov
- pydantic
- pydantic<2.0
- seaborn
- pip:
- probeye==2.3.0
Expand Down
1,917 changes: 0 additions & 1,917 deletions lebedigital/ConcreteOntology/BaseOntologies/Concrete_Ontology_MSEO.owl

This file was deleted.

2,273 changes: 0 additions & 2,273 deletions lebedigital/ConcreteOntology/BaseOntologies/MSEO_Mid.owl

This file was deleted.

This file was deleted.

231 changes: 0 additions & 231 deletions lebedigital/ConcreteOntology/BaseOntologies/WCTmid.owl

This file was deleted.

Loading
Loading