-
Notifications
You must be signed in to change notification settings - Fork 95
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
Adding robustica option to ICA decomposition to achieve consistent results #1013
Merged
Merged
Changes from all commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
f4eaa3e
Add robustica method
BahmanTahayori b0cac3a
Incorporation of major comments regarding robustica addition
BahmanTahayori 55c2ae4
Add robustica 0.1.3 to dependency list
BahmanTahayori cd55a3f
Multiple fixes to RobustICA addition from code review
BahmanTahayori 2d9b007
Specify magic number fixed seed of 42 as a constant
BahmanTahayori 09e565e
Merge remote-tracking branch 'upstream/main' into add_robustica_rsclean
BahmanTahayori fc5f9ea
Updated
BahmanTahayori 4fc3043
Robustica Updates
BahmanTahayori a20ff57
Incorporating the third round of Robert E. Smith's comments
BahmanTahayori cc5e05d
Merge pull request #3 from BahmanTahayori/add_robustica_rsclean
BahmanTahayori a449fec
Merge branch 'ME-ICA:main' into main
BahmanTahayori 78c8140
Enhance the "ica_method" description suggested by D. Handwerker
BahmanTahayori ac85e6a
Enhancing the "n_robust_runs" description suggested by D. Handwerkerd
BahmanTahayori 979d026
RobustICA: Restructure code loop over robust methods (#4)
Lestropie 71d8d4a
merging recent changes
BahmanTahayori cac38cd
Applied suggested changes
BahmanTahayori 5fcf148
Fixing the conflict
BahmanTahayori b7d08e9
Merge branch 'ME-ICA:main' into main
BahmanTahayori a113423
Incorporating more comments
BahmanTahayori b60e9a6
Merge remote-tracking branch 'upstream/main'
Lestropie 45c95ce
aligning adding-robustica with Main
handwerkerd 8e6878f
Adding already requested changes
handwerkerd 88fd148
fixed failing tests
handwerkerd a221e72
updated documentation in faq.rst
handwerkerd 8622a9b
more documentation changes
handwerkerd 419e9d4
Update docs/faq.rst
handwerkerd d29a91b
Update docs/faq.rst
handwerkerd efb712e
Aligning robustICA with current Main + (#5)
handwerkerd dee68ec
align with main
handwerkerd 171a835
Merge branch 'ME-ICA:main' into adding-robustica
handwerkerd 4b86fe2
fixed ica.py docstring error
handwerkerd c01ec51
added scikit-learn-extra to pyproject and changed ref name
handwerkerd cd50037
increment circleci version keys
handwerkerd 54a4ac3
Merge branch 'main' into adding-robustica
BahmanTahayori 9bb021a
Merge pull request #6 from handwerkerd/adding-robustica
BahmanTahayori cd29060
Merge branch 'ME-ICA:main' into main
BahmanTahayori 2a868e3
Removing the scikit-learn-extra dependency
BahmanTahayori ed10ade
Updating pyproject.toml file
BahmanTahayori 8a14277
Minor changes to make the help more readable
BahmanTahayori b793d83
Minor changes
BahmanTahayori 1b1eb38
upgrading to robustica 0.1.4
BahmanTahayori 87965f4
Update docs
BahmanTahayori 8743aca
updating utils.py, toml file and the docs
BahmanTahayori 42372e3
minor change to utils.py
BahmanTahayori 3d88eb4
Merge branch 'main' into main
handwerkerd 1aac94a
Incorporating Eneko's comments
BahmanTahayori 2b0ef67
Added a warning when the clustering method is changed
BahmanTahayori File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
"""Setting default values for ICA decomposition.""" | ||
handwerkerd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
DEFAULT_ICA_METHOD = "fastica" | ||
DEFAULT_N_MAX_ITER = 500 | ||
DEFAULT_N_MAX_RESTART = 10 | ||
DEFAULT_SEED = 42 | ||
|
||
|
||
"""Setting values for number of robust runs.""" | ||
|
||
DEFAULT_N_ROBUST_RUNS = 30 | ||
MIN_N_ROBUST_RUNS = 5 | ||
MAX_N_ROBUST_RUNS = 500 | ||
WARN_N_ROBUST_RUNS = 200 | ||
|
||
|
||
"""Setting the warning threshold for the index quality.""" | ||
|
||
WARN_IQ = 0.6 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
We probably want to open an issue so we can discuss where we move these defaults.
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.
I agree.
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.
I opened #1132.