Skip to content

Commit

Permalink
Merge pull request #1933 from trendscenter/fix/1929-update-showing-mu…
Browse files Browse the repository at this point in the history 
…ltiple-covariates

Fix/1929 update showing multiple covariates
  • Loading branch information
@rssk
rssk committed Jun 6, 2024
2 parents 34474b2 + dcbc080 commit 633117c
Show file tree
Hide file tree
Showing 21 changed files with 3,374 additions and 3,040 deletions.
421 changes: 207 additions & 214 deletions packages/coinstac-api-server/seed/data/coinstac-brainage-fnc.json
View file

Large diffs are not rendered by default.

98 changes: 63 additions & 35 deletions packages/coinstac-api-server/seed/data/coinstac-combat-dc.json
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,73 @@
{
"meta": {
"name": "Decentralized Combat",
"id": "coinstac-combatdc",
"version": "v1.0.0",
"repository": "https:\/\/github.com\/trendscenter\/coinstac-combat",
"description": "Decentralized Combat Test",
"testData": "tree/ridge-combat/test/input"
"name": "Decentralized Combat",
"id": "coinstac-combatdc",
"version": "v1.0.0",
"compspecVersion": null,
"repository": "https://github.com/trendscenter/coinstac-combat",
"description": "Input data type: CSV. Decentralized Combat for harmonizing data across various sites.",
"preprocess": null
},
"computation": {
"type": "docker",
"dockerImage": "coinstacteam/coinstac-combatdc",
"command": [
"python",
"\/computation\/local.py"
],
"remote": {
"display": {
"type": "table"
},
"input": {
"data_file": {
"label": "Data File",
"type": "files",
"items": [
"Files"
],
"extensions": [
[
"csv"
]
],
"order": 0,
"source": "member"
},
"covariate_file": {
"label": "Covariate File",
"type": "files",
"items": [
"Files"
],
"extensions": [
[
"csv"
]
],
"order": 1,
"source": "member"
},
"hidden": {
"label": " ",
"type": "hidden",
"source": "owner",
"default": " ",
"order": 3
}
},
"output": {
"hyperparameters": {
"type": "array",
"label": "Decentralized hypermeters"
}
},
"type": "docker",
"dockerImage": "coinstacteam/coinstac-combatdc",
"command": [
"python",
"\/computation\/remote.py"
]
},
"input": {
"data": {
"label": "File Path",
"type": "directory",
"items": ["File Path"],
"default": "",
"source": "member",
"order": 0
}
},
"output": {
"hyperparameters": {
"type": "array",
"label": "Decentralized hypermeters"
"python",
"/computation/local.py"
],
"remote": {
"type": "docker",
"dockerImage": "coinstacteam/coinstac-combatdc",
"command": [
"python",
"/computation/remote.py"
]
}
},
"display": {
"type": "table"
}
}
}
213 changes: 110 additions & 103 deletions packages/coinstac-api-server/seed/data/coinstac-ddfnc-pipeline.json
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,40 @@
{
"meta": {
"name": "Decentralized Dynamic Functional Connectivity (DDFNC) Pipeline",
"id": "ddfnc",
"version": "v1.0.0",
"repository": "https:\/\/github.com\/trendscenter\/coinstac_ddfnc_pipeline",
"description": "a demo for decentralized dfnc",
"testData": "tree\/master\/test"
},
"computation": {
"type": "docker",
"dockerImage": "coinstacteam/ddfnc",
"command": [
"python",
"\/computation\/local.py"
],
"remote": {
"type": "docker",
"dockerImage": "coinstacteam/ddfnc",
"command": [
"python",
"\/computation\/remote.py"
]
},
"input": {
"data": {
"meta": {
"name": "Decentralized Dynamic Functional Connectivity (DDFNC) Pipeline",
"id": "ddfnc",
"version": "v1.0.0",
"compspecVersion": null,
"repository": "https://github.com/trendscenter/coinstac_ddfnc_pipeline",
"description": "Input data type: FMRI nifti data",
"preprocess": null
},
"computation": {
"display": {
"type": "iframe"
},
"input": {
"data": {
"label": "Data",
"type": "files",
"items": ["NIfTI"],
"extensions": [["nii"]],
"items": [
"NIfTI"
],
"extensions": [
[
"nii"
]
],
"order": 0,
"source": "member"
},
"mask": {
"label": "Mask",
"type": "string",
"source": "owner",
"default": "\/computation\/local_data\/mask.nii",
"order": 1
},
"ica": {
},
"mask": {
"label": "Mask",
"type": "string",
"source": "owner",
"default": "/computation/local_data/mask.nii",
"order": 1
},
"ica": {
"label": "ICA Method",
"default": "Infomax ICA",
"type": "select",
Expand All @@ -49,83 +45,94 @@
"group": "ica",
"source": "owner",
"order": 2
},
"num_ics": {
"default": 20,
"label": "Global Number of Independent Components",
"type": "number",
"source": "owner",
"order": 3,
"group": "ica",
"showValue": "Infomax ICA",
"conditional": {
},
"num_ics": {
"default": 20,
"label": "Global Number of Independent Components",
"type": "number",
"source": "owner",
"order": 3,
"group": "ica",
"showValue": "Infomax ICA",
"conditional": {
"variable": "ica",
"value": "Infomax ICA"
}
},
"scica_template": {
"label": "Spatially Constrained ICA Template",
"type": "string",
"source": "owner",
"order": 4,
"group": "ica",
"default": "\/computation\/local_data\/NeuroMark.nii",
"showValue": "Spatially Constrained",
"conditional": {
}
},
"scica_template": {
"label": "Spatially Constrained ICA Template",
"type": "string",
"source": "owner",
"order": 4,
"group": "ica",
"default": "/computation/local_data/NeuroMark.nii",
"showValue": "Spatially Constrained",
"conditional": {
"variable": "ica",
"value": "Infomax ICA"
}
},
"fnc": {
"label": "Kind of FNC to perform",
"type": "select",
"default": "None",
"values": [
"None",
"Static FNC",
"Dynamic FNC"
],
"group": "fnc_method",
"source": "owner",
"order": 5
},
"fnc_window_size": {
"default": 22,
"label": "Sliding Window Size",
"type": "number",
"source": "owner",
"order": 6,
"group": "fnc_method",
"showValue": "Dynamic FNC",
"conditional": {
}
},
"fnc": {
"label": "Kind of FNC to perform",
"type": "select",
"default": "None",
"values": [
"None",
"Static FNC",
"Dynamic FNC"
],
"group": "fnc_method",
"source": "owner",
"order": 5
},
"fnc_window_size": {
"default": 22,
"label": "Sliding Window Size",
"type": "number",
"source": "owner",
"order": 6,
"group": "fnc_method",
"showValue": "Dynamic FNC",
"conditional": {
"variable": "fnc",
"value": "Dynamic FNC"
}
},
"dfnc_k": {
"default": 5,
"label": "Number of Clusters",
"type": "number",
"source": "owner",
"order": 7,
"group": "fnc_method",
"showValue": "Dynamic FNC",
"conditional": {
}
},
"dfnc_k": {
"default": 5,
"label": "Number of Clusters",
"type": "number",
"source": "owner",
"order": 7,
"group": "fnc_method",
"showValue": "Dynamic FNC",
"conditional": {
"variable": "fnc",
"value": "Dynamic FNC"
}
},
"results_html_path": {
}
},
"results_html_path": {
"order": 8,
"label": "Results HTML Path",
"default": "gica_cmd_gica_results/icatb_gica_html_report.html",
"type": "string",
"source": "owner"
}
},
"output": {},
"display": {
"type": "iframe"
}
}
}
}
},
"output": {},
"type": "docker",
"dockerImage": "coinstacteam/ddfnc",
"command": [
"python",
"/computation/local.py"
],
"remote": {
"type": "docker",
"dockerImage": "coinstacteam/ddfnc",
"command": [
"python",
"/computation/remote.py"
]
}
}
}
Loading

0 comments on commit 633117c

Please sign in to comment.