Skip to content

Fix infomax #6921

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.

Sign up for GitHub

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

Merged
agramfort merged 3 commits into from
Oct 5, 2019
Merged

Fix infomax #6921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a75bcc
fix extended infomax
drammock Oct 5, 2019
e0436a7
update whats new
drammock Oct 5, 2019
ddf4564
cleaner way, using setdefault
drammock Oct 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/changes/latest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Changelog
Bug
~~~

- Fix bug in :class:`~mne.preprocessing.ICA` where requesting extended infomax via ``fit_params={'extended': True}`` was overridden, by `Daniel McCloy`_.

- Fix TAL channel parsing (annotations) for EDF-D files by `Clemens Brunner`_

- Fix handling of repeated events in :class:`mne.Epochs` by `Fahimeh Mamashli`_ and `Alex Gramfort`_
Expand Down
10 changes: 4 additions & 6 deletions mne/preprocessing/ica.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,12 +357,10 @@ def __init__(self, n_components=None, max_pca_components=None,
fit_params.update({k: v for k, v in update.items() if k
not in fit_params})
elif method == 'infomax':
fit_params.update({'extended': False})
elif method == 'extended-infomax':
fit_params.update({'extended': True})
method = 'infomax'
if 'max_iter' not in fit_params:
fit_params['max_iter'] = max_iter
# extended=True is default in underlying function, but we want
# default False here unless user specified True:
fit_params.setdefault('extended', False)
fit_params.setdefault('max_iter', max_iter)
self.max_iter = max_iter
self.fit_params = fit_params

Expand Down