Skip to content

Commit 935c6ba

Browse files
authored
Minor changes (#161)
* Move ega_accession to File base class * Make ResearchDataFile.experiment plural * Update artifacts
1 parent 85e3838 commit 935c6ba

19 files changed

+94
-132
lines changed

docs/entity_relations.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ ProcessDataFile ||--|| Analysis : "analysis"
9494
ProcessDataFile ||--|| Dataset : "dataset"
9595
Analysis ||--|| AnalysisMethod : "analysis_method"
9696
Analysis ||--}| ResearchDataFile : "research_data_files"
97-
ResearchDataFile ||--}| Experiment : "experiment"
97+
ResearchDataFile ||--}| Experiment : "experiments"
9898
ResearchDataFile ||--|| Dataset : "dataset"
9999
Experiment ||--|| ExperimentMethod : "experiment_method"
100100
Experiment ||--|| Sample : "sample"
@@ -152,7 +152,7 @@ Experiment {
152152
ExperimentMethodSupportingFile ||--|| ExperimentMethod : "experiment_method"
153153
ExperimentMethodSupportingFile ||--|| Dataset : "dataset"
154154
ExperimentMethod ||--}o Attribute : "attributes"
155-
ResearchDataFile ||--}| Experiment : "experiment"
155+
ResearchDataFile ||--}| Experiment : "experiments"
156156
ResearchDataFile ||--|| Dataset : "dataset"
157157
Sample ||--|| Individual : "individual"
158158
Sample ||--}o Attribute : "attributes"
@@ -220,6 +220,7 @@ erDiagram
220220
ExperimentMethodSupportingFile {
221221
SupportingFileFormatEnum format
222222
string name
223+
string ega_accession
223224
boolean included_in_submission
224225
string alias
225226
}
@@ -251,8 +252,8 @@ ResearchDataFile {
251252
ResearchDataFileFormatEnum format
252253
integer technical_replicate
253254
string sequencing_lane_id
254-
string ega_accession
255255
string name
256+
string ega_accession
256257
boolean included_in_submission
257258
string alias
258259
}
@@ -288,7 +289,7 @@ Experiment {
288289
ExperimentMethodSupportingFile ||--|| ExperimentMethod : "experiment_method"
289290
ExperimentMethodSupportingFile ||--|| Dataset : "dataset"
290291
ExperimentMethod ||--}o Attribute : "attributes"
291-
ResearchDataFile ||--}| Experiment : "experiment"
292+
ResearchDataFile ||--}| Experiment : "experiments"
292293
ResearchDataFile ||--|| Dataset : "dataset"
293294
Sample ||--|| Individual : "individual"
294295
Sample ||--}o Attribute : "attributes"

docs/schema_markdown/AnalysisMethodSupportingFile.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ An Analysis Method Supporting File is a File that contains additional informatio
77
URI: [GHGA:AnalysisMethodSupportingFile](https://w3id.org/GHGA/AnalysisMethodSupportingFile)
88

99

10-
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[File],[Dataset],[AnalysisMethod]<analysis_method%201..1-%20[AnalysisMethodSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20analysis_method_supporting_files%201..*>[AnalysisMethodSupportingFile],[Submission]-%20analysis_method_supporting_files(i)%200..*>[AnalysisMethodSupportingFile],[File]^-[AnalysisMethodSupportingFile],[AnalysisMethod])](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[File],[Dataset],[AnalysisMethod]<analysis_method%201..1-%20[AnalysisMethodSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20analysis_method_supporting_files%201..*>[AnalysisMethodSupportingFile],[Submission]-%20analysis_method_supporting_files(i)%200..*>[AnalysisMethodSupportingFile],[File]^-[AnalysisMethodSupportingFile],[AnalysisMethod])
10+
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[File],[Dataset],[AnalysisMethod]<analysis_method%201..1-%20[AnalysisMethodSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;ega_accession(i):string%20%3F;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20analysis_method_supporting_files%201..*>[AnalysisMethodSupportingFile],[Submission]-%20analysis_method_supporting_files(i)%200..*>[AnalysisMethodSupportingFile],[File]^-[AnalysisMethodSupportingFile],[AnalysisMethod])](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[File],[Dataset],[AnalysisMethod]<analysis_method%201..1-%20[AnalysisMethodSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;ega_accession(i):string%20%3F;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20analysis_method_supporting_files%201..*>[AnalysisMethodSupportingFile],[Submission]-%20analysis_method_supporting_files(i)%200..*>[AnalysisMethodSupportingFile],[File]^-[AnalysisMethodSupportingFile],[AnalysisMethod])
1111

1212
## Parents
1313

@@ -38,6 +38,9 @@ URI: [GHGA:AnalysisMethodSupportingFile](https://w3id.org/GHGA/AnalysisMethodSup
3838
* [File➞dataset](File_dataset.md) <sub>1..1</sub>
3939
* Description: The Dataset alias associated with this File.
4040
* Range: [Dataset](Dataset.md)
41+
* [File➞ega_accession](File_ega_accession.md) <sub>0..1</sub>
42+
* Description: The EGA accession ID of an entity.
43+
* Range: [String](types/String.md)
4144
* [File➞included_in_submission](File_included_in_submission.md) <sub>1..1</sub>
4245
* Description: Whether a File is included in the Submission or not.
4346
* Range: [Boolean](types/Boolean.md)

docs/schema_markdown/Experiment.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ An Experiment is an investigation that consists of a coordinated set of actions
77
URI: [GHGA:Experiment](https://w3id.org/GHGA/Experiment)
88

99

10-
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[Sample],[ResearchDataFile],[IdentifiedByAliasMixin],[ExperimentMethod],[Sample]<sample%201..1-%20[Experiment&#124;title:string;description:string;type:string%20%3F;ega_accession:string%20%3F;alias:string],[ExperimentMethod]<experiment_method%201..1-%20[Experiment],[ResearchDataFile]-%20experiment%201..*>[Experiment],[Submission]++-%20experiments%201..*>[Experiment],[ResearchDataFile]-%20experiment(i)%200..1>[Experiment],[Submission]-%20experiments(i)%200..*>[Experiment],[Experiment]uses%20-.->[IdentifiedByAliasMixin],[Experiment]uses%20-.->[AttributeMixin],[AttributeMixin],[Attribute])](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[Sample],[ResearchDataFile],[IdentifiedByAliasMixin],[ExperimentMethod],[Sample]<sample%201..1-%20[Experiment&#124;title:string;description:string;type:string%20%3F;ega_accession:string%20%3F;alias:string],[ExperimentMethod]<experiment_method%201..1-%20[Experiment],[ResearchDataFile]-%20experiment%201..*>[Experiment],[Submission]++-%20experiments%201..*>[Experiment],[ResearchDataFile]-%20experiment(i)%200..1>[Experiment],[Submission]-%20experiments(i)%200..*>[Experiment],[Experiment]uses%20-.->[IdentifiedByAliasMixin],[Experiment]uses%20-.->[AttributeMixin],[AttributeMixin],[Attribute])
10+
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[Sample],[ResearchDataFile],[IdentifiedByAliasMixin],[ExperimentMethod],[Sample]<sample%201..1-%20[Experiment&#124;title:string;description:string;type:string%20%3F;ega_accession:string%20%3F;alias:string],[ExperimentMethod]<experiment_method%201..1-%20[Experiment],[ResearchDataFile]-%20experiments%201..*>[Experiment],[Submission]++-%20experiments%201..*>[Experiment],[ResearchDataFile]-%20experiments(i)%200..*>[Experiment],[Submission]-%20experiments(i)%200..*>[Experiment],[Experiment]uses%20-.->[IdentifiedByAliasMixin],[Experiment]uses%20-.->[AttributeMixin],[AttributeMixin],[Attribute])](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[Sample],[ResearchDataFile],[IdentifiedByAliasMixin],[ExperimentMethod],[Sample]<sample%201..1-%20[Experiment&#124;title:string;description:string;type:string%20%3F;ega_accession:string%20%3F;alias:string],[ExperimentMethod]<experiment_method%201..1-%20[Experiment],[ResearchDataFile]-%20experiments%201..*>[Experiment],[Submission]++-%20experiments%201..*>[Experiment],[ResearchDataFile]-%20experiments(i)%200..*>[Experiment],[Submission]-%20experiments(i)%200..*>[Experiment],[Experiment]uses%20-.->[IdentifiedByAliasMixin],[Experiment]uses%20-.->[AttributeMixin],[AttributeMixin],[Attribute])
1111

1212
## Uses Mixin
1313

@@ -16,9 +16,8 @@ URI: [GHGA:Experiment](https://w3id.org/GHGA/Experiment)
1616

1717
## Referenced by Class
1818

19-
* **[ResearchDataFile](ResearchDataFile.md)** *[ResearchDataFile➞experiment](ResearchDataFile_experiment.md)* <sub>1..\*</sub> **[Experiment](Experiment.md)**
19+
* **[ResearchDataFile](ResearchDataFile.md)** *[ResearchDataFile➞experiments](ResearchDataFile_experiments.md)* <sub>1..\*</sub> **[Experiment](Experiment.md)**
2020
* **[Submission](Submission.md)** *[Submission➞experiments](Submission_experiments.md)* <sub>1..\*</sub> **[Experiment](Experiment.md)**
21-
* **None** *[experiment](experiment.md)* <sub>0..1</sub> **[Experiment](Experiment.md)**
2221
* **None** *[experiments](experiments.md)* <sub>0..\*</sub> **[Experiment](Experiment.md)**
2322

2423
## Attributes

docs/schema_markdown/ExperimentMethodSupportingFile.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ An Experiment Method Supporting File is a File that contains additional informat
77
URI: [GHGA:ExperimentMethodSupportingFile](https://w3id.org/GHGA/ExperimentMethodSupportingFile)
88

99

10-
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[File],[ExperimentMethod]<experiment_method%201..1-%20[ExperimentMethodSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20experiment_method_supporting_files%201..*>[ExperimentMethodSupportingFile],[Submission]-%20experiment_method_supporting_files(i)%200..*>[ExperimentMethodSupportingFile],[File]^-[ExperimentMethodSupportingFile],[ExperimentMethod],[Dataset])](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[File],[ExperimentMethod]<experiment_method%201..1-%20[ExperimentMethodSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20experiment_method_supporting_files%201..*>[ExperimentMethodSupportingFile],[Submission]-%20experiment_method_supporting_files(i)%200..*>[ExperimentMethodSupportingFile],[File]^-[ExperimentMethodSupportingFile],[ExperimentMethod],[Dataset])
10+
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[File],[ExperimentMethod]<experiment_method%201..1-%20[ExperimentMethodSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;ega_accession(i):string%20%3F;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20experiment_method_supporting_files%201..*>[ExperimentMethodSupportingFile],[Submission]-%20experiment_method_supporting_files(i)%200..*>[ExperimentMethodSupportingFile],[File]^-[ExperimentMethodSupportingFile],[ExperimentMethod],[Dataset])](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[File],[ExperimentMethod]<experiment_method%201..1-%20[ExperimentMethodSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;ega_accession(i):string%20%3F;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20experiment_method_supporting_files%201..*>[ExperimentMethodSupportingFile],[Submission]-%20experiment_method_supporting_files(i)%200..*>[ExperimentMethodSupportingFile],[File]^-[ExperimentMethodSupportingFile],[ExperimentMethod],[Dataset])
1111

1212
## Parents
1313

@@ -38,6 +38,9 @@ URI: [GHGA:ExperimentMethodSupportingFile](https://w3id.org/GHGA/ExperimentMetho
3838
* [File➞dataset](File_dataset.md) <sub>1..1</sub>
3939
* Description: The Dataset alias associated with this File.
4040
* Range: [Dataset](Dataset.md)
41+
* [File➞ega_accession](File_ega_accession.md) <sub>0..1</sub>
42+
* Description: The EGA accession ID of an entity.
43+
* Range: [String](types/String.md)
4144
* [File➞included_in_submission](File_included_in_submission.md) <sub>1..1</sub>
4245
* Description: Whether a File is included in the Submission or not.
4346
* Range: [Boolean](types/Boolean.md)

docs/schema_markdown/File.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A file is an object that contains information generated from a process, either a
77
URI: [GHGA:File](https://w3id.org/GHGA/File)
88

99

10-
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[ResearchDataFile],[ProcessDataFile],[IndividualSupportingFile],[IdentifiedByAliasMixin],[Dataset]<dataset%201..1-%20[File&#124;name:string;included_in_submission:boolean;alias:string],[File]uses%20-.->[IdentifiedByAliasMixin],[File]^-[ResearchDataFile],[File]^-[ProcessDataFile],[File]^-[IndividualSupportingFile],[File]^-[ExperimentMethodSupportingFile],[File]^-[AnalysisMethodSupportingFile],[ExperimentMethodSupportingFile],[Dataset],[AnalysisMethodSupportingFile])](https://yuml.me/diagram/nofunky;dir:TB/class/[ResearchDataFile],[ProcessDataFile],[IndividualSupportingFile],[IdentifiedByAliasMixin],[Dataset]<dataset%201..1-%20[File&#124;name:string;included_in_submission:boolean;alias:string],[File]uses%20-.->[IdentifiedByAliasMixin],[File]^-[ResearchDataFile],[File]^-[ProcessDataFile],[File]^-[IndividualSupportingFile],[File]^-[ExperimentMethodSupportingFile],[File]^-[AnalysisMethodSupportingFile],[ExperimentMethodSupportingFile],[Dataset],[AnalysisMethodSupportingFile])
10+
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[ResearchDataFile],[ProcessDataFile],[IndividualSupportingFile],[IdentifiedByAliasMixin],[Dataset]<dataset%201..1-%20[File&#124;name:string;ega_accession:string%20%3F;included_in_submission:boolean;alias:string],[File]uses%20-.->[IdentifiedByAliasMixin],[File]^-[ResearchDataFile],[File]^-[ProcessDataFile],[File]^-[IndividualSupportingFile],[File]^-[ExperimentMethodSupportingFile],[File]^-[AnalysisMethodSupportingFile],[ExperimentMethodSupportingFile],[Dataset],[AnalysisMethodSupportingFile])](https://yuml.me/diagram/nofunky;dir:TB/class/[ResearchDataFile],[ProcessDataFile],[IndividualSupportingFile],[IdentifiedByAliasMixin],[Dataset]<dataset%201..1-%20[File&#124;name:string;ega_accession:string%20%3F;included_in_submission:boolean;alias:string],[File]uses%20-.->[IdentifiedByAliasMixin],[File]^-[ResearchDataFile],[File]^-[ProcessDataFile],[File]^-[IndividualSupportingFile],[File]^-[ExperimentMethodSupportingFile],[File]^-[AnalysisMethodSupportingFile],[ExperimentMethodSupportingFile],[Dataset],[AnalysisMethodSupportingFile])
1111

1212
## Uses Mixin
1313

@@ -35,6 +35,9 @@ URI: [GHGA:File](https://w3id.org/GHGA/File)
3535
* [File➞dataset](File_dataset.md) <sub>1..1</sub>
3636
* Description: The Dataset alias associated with this File.
3737
* Range: [Dataset](Dataset.md)
38+
* [File➞ega_accession](File_ega_accession.md) <sub>0..1</sub>
39+
* Description: The EGA accession ID of an entity.
40+
* Range: [String](types/String.md)
3841
* [File➞included_in_submission](File_included_in_submission.md) <sub>1..1</sub>
3942
* Description: Whether a File is included in the Submission or not.
4043
* Range: [Boolean](types/Boolean.md)
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
# Slot: ega_accession
3+
4+
5+
The EGA accession ID of an entity.
6+
7+
URI: [GHGA:File_ega_accession](https://w3id.org/GHGA/File_ega_accession)
8+
9+
10+
## Domain and Range
11+
12+
[File](File.md) &#8594; <sub>0..1</sub> [String](types/String.md)
13+
14+
## Parents
15+
16+
* is_a: [ega_accession](ega_accession.md)
17+
18+
## Children
19+
20+
21+
## Used by
22+
23+
* [AnalysisMethodSupportingFile](AnalysisMethodSupportingFile.md)
24+
* [ExperimentMethodSupportingFile](ExperimentMethodSupportingFile.md)
25+
* [File](File.md)
26+
* [IndividualSupportingFile](IndividualSupportingFile.md)
27+
* [ProcessDataFile](ProcessDataFile.md)
28+
* [ResearchDataFile](ResearchDataFile.md)

docs/schema_markdown/IndividualSupportingFile.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ An Individual Supporting File is a File that contains additional information rel
77
URI: [GHGA:IndividualSupportingFile](https://w3id.org/GHGA/IndividualSupportingFile)
88

99

10-
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[Individual]<individual%201..1-%20[IndividualSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20individual_supporting_files%201..*>[IndividualSupportingFile],[Submission]-%20individual_supporting_files(i)%200..*>[IndividualSupportingFile],[File]^-[IndividualSupportingFile],[Individual],[File],[Dataset])](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[Individual]<individual%201..1-%20[IndividualSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20individual_supporting_files%201..*>[IndividualSupportingFile],[Submission]-%20individual_supporting_files(i)%200..*>[IndividualSupportingFile],[File]^-[IndividualSupportingFile],[Individual],[File],[Dataset])
10+
[![img](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[Individual]<individual%201..1-%20[IndividualSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;ega_accession(i):string%20%3F;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20individual_supporting_files%201..*>[IndividualSupportingFile],[Submission]-%20individual_supporting_files(i)%200..*>[IndividualSupportingFile],[File]^-[IndividualSupportingFile],[Individual],[File],[Dataset])](https://yuml.me/diagram/nofunky;dir:TB/class/[Submission],[Individual]<individual%201..1-%20[IndividualSupportingFile&#124;format:SupportingFileFormatEnum;name(i):string;ega_accession(i):string%20%3F;included_in_submission(i):boolean;alias(i):string],[Submission]++-%20individual_supporting_files%201..*>[IndividualSupportingFile],[Submission]-%20individual_supporting_files(i)%200..*>[IndividualSupportingFile],[File]^-[IndividualSupportingFile],[Individual],[File],[Dataset])
1111

1212
## Parents
1313

@@ -38,6 +38,9 @@ URI: [GHGA:IndividualSupportingFile](https://w3id.org/GHGA/IndividualSupportingF
3838
* [File➞dataset](File_dataset.md) <sub>1..1</sub>
3939
* Description: The Dataset alias associated with this File.
4040
* Range: [Dataset](Dataset.md)
41+
* [File➞ega_accession](File_ega_accession.md) <sub>0..1</sub>
42+
* Description: The EGA accession ID of an entity.
43+
* Range: [String](types/String.md)
4144
* [File➞included_in_submission](File_included_in_submission.md) <sub>1..1</sub>
4245
* Description: Whether a File is included in the Submission or not.
4346
* Range: [Boolean](types/Boolean.md)

0 commit comments

Comments
 (0)