-
Notifications
You must be signed in to change notification settings - Fork 55
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
Refactoring tsvtool #338
Refactoring tsvtool #338
Conversation
Hello @camillebrianceau! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found: There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻 Comment last updated at 2022-09-13 09:52:58 UTC |
…/clinicadl into cb_tsvtools_refactoring
clinicadl/tsvtools/prepare_experiment/prepare_experiment_cli.py
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @camillebrianceau ,
Thanks for this huge PR. Requested changes concerns mainly the docstrings and some texts. Also try to add typing hints to the new functions that you create.
About the files in the folder tests/data/tsvtool/
, these files will be in the new data ci package? If yes, I suppose that they can be removed from this repository.
Co-authored-by: mdiazmel <[email protected]>
…/clinicadl into cb_tsvtools_refactoring
I think that this PR is ready to merge. At the end, what is new ? TSVTOOL REFACTORING
#310Remove restrict command GETLABELS#311 Change diagnosis into group and subgroup #312 Now there is only one tsv. Now, instead of giving path to the missing_mods directory and merge.tsv file, we only give a BIDS_directory and the pipeline will perform clinica iotools merge-tsvand clinica iotools check_missings_modalities inside the get labels pipeline The command line for get labels is:
input : BIDS directory SPLIT AND K-FOLD314 done CHANGES THAT NEED TO BE DISCUSSED
I know that I still need to write the docs. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a couple of changes before merging!
Co-authored-by: mdiazmel <[email protected]>
Co-authored-by: mdiazmel <[email protected]>
Co-authored-by: mdiazmel <[email protected]>
Co-authored-by: mdiazmel <[email protected]>
Co-authored-by: mdiazmel <[email protected]>
Co-authored-by: mdiazmel <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
I'll merge.
Note: tests for tsvtools are failing because they need the data provided by PR #350 (to be merged soon).
* change diagnosis into group and subgroup * change diagnosis into group and subgroup * change diagnosis into group and subgroup * change diagnosis into group and subgroup * Update tsvtools tests * Update tsvtools tests * simplify kfold and split * update doc * Add docs and add some changes * Update tests * update tests * update getlabels * Update tsvtools * update docs * update jenkins * update tests * Update test tsvtools * test * update Jenkins * update * update * update docs * update docs * update kfold * add get_metadata function * add tests * Changes 30/09 * Update * update * update * Update clinicadl/tsvtools/analysis/analysis_cli.py Co-authored-by: mdiazmel <[email protected]> * update * update * update * update after review * update tests * update tests * Update clinicadl/tsvtools/get_metadata/get_metadata.py Co-authored-by: mdiazmel <[email protected]> * Update clinicadl/tsvtools/get_metadata/get_metadata.py Co-authored-by: mdiazmel <[email protected]> * Update clinicadl/tsvtools/get_progression/get_progression_cli.py Co-authored-by: mdiazmel <[email protected]> * Update clinicadl/tsvtools/get_progression/get_progression_cli.py Co-authored-by: mdiazmel <[email protected]> * Update clinicadl/tsvtools/split/split.py Co-authored-by: mdiazmel <[email protected]> * Update clinicadl/tsvtools/split/split.py Co-authored-by: mdiazmel <[email protected]> * couple of changes before merging Co-authored-by: mdiazmel <[email protected]>
TSVTOOL REFACTORING
#313
tsvtool
-->tsvtools
extract
-->prepare-data
split
/kfold
--> ??#310 Remove
restrict
commandGETLABELS
#311 Change diagnosis into group and subgroup
#258 For now, each
group
(CN --> MCI --> AD) has asubgroup
( p, s, r, us, uk) and this subgroup represents the evolution of the disease during time_horizon :#233 done
#312 Now there is only one tsv with group and subgroup and the group columns is what was called diagnosis in the old version of get labels.
Now, instead of giving path to the missing_mods directory and merge.tsv file, we only give a BIDS_directory and the pipeline will perform
clinica iotools merge-tsv
andclinica iotools check_missings_modalities
inside theget labels
pipelineThe command line for get labels is:
input : BIDS directory and GETLABELS directory
output : (in getlabels directory) getlabels.json + getlabels.tsv + merge.tsv + missing_mods_directory
SPLIT AND K-FOLD
#314 almost done
CHANGES THAT NEED TO BE DISCUSSED
uk
is unknown subgroup : if there are not enough sessions to assess the reliability of the label but no changes were spotted. I chose to putuk
for each last session.getlabels
function showing the progression of Alzheimer's disease : {CN:0, MCI:1, AD:2 }.I added the option --stability_dict, no need to keep it, but if wanted, we can pass a list of diagnoses into the command line in order of the disease progression so we can work with other disesases.
--diagnosis
with a group, you will get all subjects for whom, for at least one session, the diagnostic is this group.--diagnosis
with a subgroup, you will get all subjects that have this subgroup