Skip to content

Commit 897a68c

Browse files
committed
switch connection between RP and RPVs
RPVs now refer to their parent RP with isVersionOf. We remove hasVersion from the RP. Related to openMetadataInitiative/openMINDS_core#553
1 parent 95df82f commit 897a68c

File tree

4 files changed

+25
-31
lines changed

4 files changed

+25
-31
lines changed

schemas/validationTest.schema.tpl.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@
2020
"core:DOI"
2121
]
2222
},
23-
"hasVersion": {
24-
"type": "array",
25-
"minItems": 1,
26-
"uniqueItems": true,
27-
"_instruction": "Add all versions of this validation test.",
28-
"_linkedTypes": [
29-
"computation:ValidationTestVersion"
30-
]
31-
},
3223
"referenceDataAcquisition": {
3324
"type": "array",
3425
"minItems": 1,
@@ -43,7 +34,7 @@
4334
"_linkedTypes": [
4435
"controlledTerms:ModelScope"
4536
]
46-
},
37+
},
4738
"scoreType": {
4839
"_instruction": "Add the type of score calculated in this validation test.",
4940
"_linkedTypes": [

schemas/validationTestVersion.schema.tpl.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"required": [
55
"format"
66
],
7-
"properties": {
7+
"properties": {
88
"configuration": {
99
"_instruction": "Add the configuration information for this validation test version (e.g., arguments to the SciUnit class).",
1010
"_linkedTypes": [
@@ -28,7 +28,7 @@
2828
"_linkedTypes": [
2929
"core:DOI"
3030
]
31-
},
31+
},
3232
"entryPoint": {
3333
"type": "string",
3434
"_instruction": "Add the entry point for this validation test version (e.g., the Python class name for a SciUnit test)."
@@ -39,7 +39,13 @@
3939
"core:ContentType"
4040
]
4141
},
42-
"isAlternativeVersionOf": {
42+
"isPrecededBy": {
43+
"_instruction": "Add the validation test version preceding this validation test version.",
44+
"_linkedTypes": [
45+
"computation:ValidationTestVersion"
46+
]
47+
},
48+
"isVariantOf": {
4349
"type": "array",
4450
"minItems": 1,
4551
"uniqueItems": true,
@@ -48,10 +54,10 @@
4854
"computation:ValidationTestVersion"
4955
]
5056
},
51-
"isNewVersionOf": {
52-
"_instruction": "Add the validation test version preceding this validation test version.",
57+
"isVersionOf": {
58+
"_instruction": "Add the version-independent information about this validation test.",
5359
"_linkedTypes": [
54-
"computation:ValidationTestVersion"
60+
"computation:ValidationTest"
5561
]
5662
},
5763
"license": {

schemas/workflowRecipe.schema.tpl.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
"_linkedTypes": [
2020
"core:DOI"
2121
]
22-
},
23-
"hasVersion": {
24-
"type": "array",
25-
"minItems": 1,
26-
"uniqueItems": true,
27-
"_instruction": "Add all versions of this workflow recipe.",
28-
"_linkedTypes": [
29-
"computation:WorkflowRecipeVersion"
30-
]
3122
}
3223
}
3324
}

schemas/workflowRecipeVersion.schema.tpl.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"_linkedTypes": [
2020
"core:DOI"
2121
]
22-
},
22+
},
2323
"format": {
2424
"_instruction": "Add the content type of this workflow recipe version.",
2525
"_linkedTypes": [
@@ -32,13 +32,19 @@
3232
"uniqueItems": true,
3333
"_instruction": "Add all entities that are components of this workflow recipe version (e.g., other workflow recipe versions or software used in this workflow).",
3434
"_linkedTypes": [
35-
"computation:WorkflowRecipeVersion",
35+
"computation:WorkflowRecipeVersion",
3636
"core:File",
3737
"core:FileBundle",
3838
"core:SoftwareVersion"
3939
]
4040
},
41-
"isAlternativeVersionOf": {
41+
"isPrecededBy": {
42+
"_instruction": "Add the workflow recipe version preceding this workflow recipe version.",
43+
"_linkedTypes": [
44+
"computation:WorkflowRecipeVersion"
45+
]
46+
},
47+
"isVariantOf": {
4248
"type": "array",
4349
"minItems": 1,
4450
"uniqueItems": true,
@@ -47,10 +53,10 @@
4753
"computation:WorkflowRecipeVersion"
4854
]
4955
},
50-
"isNewVersionOf": {
51-
"_instruction": "Add the workflow recipe version preceding this workflow recipe version.",
56+
"isVersionOf": {
57+
"_instruction": "Add the version-independent information about this workflow recipe.",
5258
"_linkedTypes": [
53-
"computation:WorkflowRecipeVersion"
59+
"computation:Workflow"
5460
]
5561
},
5662
"license": {

0 commit comments

Comments
 (0)