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

[FIX] Sort comptable by varex before identifying outlier components #261

Closed
wants to merge 3 commits into from

Conversation

tsalo
Copy link
Member

@tsalo tsalo commented Apr 20, 2019

Closes #176. While this does not clarify everything about this step (e.g., why it is run three times specifically, or why the outlier components are excluded when computing elbows but not when selecting components later), it does resolve the most pressing issue of explaining why the step exists.

This was originally part of #247, but has been split off because it is self-contained and should be merged separately.

Changes proposed in this pull request:

  • Sort component table when identifying ncls (components presumably without outlier variance explained) by descending variance explained. Before, the component table was sorted by descending Kappa values when identifying outliers. Per discussions with @handwerkerd, this was identified as a bug.

@codecov
Copy link

codecov bot commented Apr 20, 2019

Codecov Report

Merging #261 into master will increase coverage by 0.14%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #261      +/-   ##
==========================================
+ Coverage   45.94%   46.08%   +0.14%     
==========================================
  Files          35       33       -2     
  Lines        2070     2046      -24     
==========================================
- Hits          951      943       -8     
+ Misses       1119     1103      -16
Impacted Files Coverage Δ
tedana/selection/select_comps.py 5% <0%> (+0.23%) ⬆️
tedana/decomposition/__init__.py 100% <0%> (ø) ⬆️
tedana/selection/__init__.py 100% <0%> (ø) ⬆️
tedana/decomposition/pca.py
tedana/decomposition/ica.py
tedana/selection/tedpca.py
tedana/decomposition/eigendecomp.py 10.46% <0%> (ø)
tedana/combine.py 88.23% <0%> (+0.23%) ⬆️
tedana/workflows/tedana.py 14.64% <0%> (+2.21%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ebd3672...82276c6. Read the comment docs.

@tsalo tsalo requested a review from handwerkerd April 20, 2019 17:24
handwerkerd
handwerkerd previously approved these changes May 3, 2019
Copy link
Member

@handwerkerd handwerkerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this whole step is problematic and we should consider cutting it, but I agree that replaced an incorrectly implemented problematic step with a correctly implemented problematic step is an improvement.

@tsalo
Copy link
Member Author

tsalo commented May 4, 2019

Awesome! I'll wait until we merge #266, handle the merge conflicts, and then merge this in.

# Conflicts:
#	tedana/selection/select_comps.py
@tsalo
Copy link
Member Author

tsalo commented May 23, 2019

Unfortunately the merge conflicts are being terrible, so I'm going to just close this and open a new PR from a fresh branch.

@tsalo tsalo closed this May 23, 2019
@tsalo tsalo deleted the fix-varex-sorting branch May 23, 2019 16:35
@jbteves
Copy link
Collaborator

jbteves commented May 23, 2019

Okay. I think that you should be able to fix them by rebasing this branch on top of master, resolving conflicts using "theirs" and then force-pushing here. But I'm not sure what exactly the conflicts are so I could be wrong.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Determine rationale for for loop in Step 2 of selcomps (v2.5)
3 participants