From 5a75bcc2c3bc262310bffb2fc71a48674b3afc94 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Fri, 4 Oct 2019 17:04:45 -0700 Subject: [PATCH 1/3] fix extended infomax --- mne/preprocessing/ica.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mne/preprocessing/ica.py b/mne/preprocessing/ica.py index 1331d1c7366..104d1b023b3 100644 --- a/mne/preprocessing/ica.py +++ b/mne/preprocessing/ica.py @@ -357,10 +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' + # extended=True is default in underlying function, but we want + # default False here unless user specified True: + ext = fit_params.get('extended', False) + fit_params.update({'extended': ext}) if 'max_iter' not in fit_params: fit_params['max_iter'] = max_iter self.max_iter = max_iter From e0436a726627179bcddf334bd93de806dc023db4 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Fri, 4 Oct 2019 17:07:16 -0700 Subject: [PATCH 2/3] update whats new --- doc/changes/latest.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/changes/latest.inc b/doc/changes/latest.inc index 7f31196711d..0649a9866aa 100644 --- a/doc/changes/latest.inc +++ b/doc/changes/latest.inc @@ -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`_ From ddf4564128a5648225107abc2f20cb812cab36f7 Mon Sep 17 00:00:00 2001 From: Daniel McCloy Date: Fri, 4 Oct 2019 22:36:27 -0700 Subject: [PATCH 3/3] cleaner way, using setdefault --- mne/preprocessing/ica.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mne/preprocessing/ica.py b/mne/preprocessing/ica.py index 104d1b023b3..ed7ba721bd9 100644 --- a/mne/preprocessing/ica.py +++ b/mne/preprocessing/ica.py @@ -359,10 +359,8 @@ def __init__(self, n_components=None, max_pca_components=None, elif method == 'infomax': # extended=True is default in underlying function, but we want # default False here unless user specified True: - ext = fit_params.get('extended', False) - fit_params.update({'extended': ext}) - if 'max_iter' not in fit_params: - fit_params['max_iter'] = max_iter + fit_params.setdefault('extended', False) + fit_params.setdefault('max_iter', max_iter) self.max_iter = max_iter self.fit_params = fit_params