FIX: Xdawn with shuffled epochs #3373
Merged
Conversation
This file contains hidden or 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
Current coverage is 86.67%@@ master #3373 diff @@
==========================================
Files 335 335
Lines 57628 57635 +7
Methods 0 0
Messages 0 0
Branches 8721 8782 +61
==========================================
+ Hits 30105 49957 +19852
+ Misses 25694 5003 -20691
- Partials 1829 2675 +846
|
mne/preprocessing/xdawn.py
Outdated
| """ | ||
|
|
||
| # Ensure epochs order | ||
| epochs = epochs[np.argsort(epochs.events[:, 0])] |
Member
There was a problem hiding this comment.
just sort if not sorted already. Otherwise you make a copy for nothing.
something like
np.all(np.diff(epochs.events[:, 0]) >= 0)
Member
|
@kingjr I think you found your bug :) |
Member
|
thx @kingjr |
jona-sassenhagen
added a commit
to jona-sassenhagen/mne-python
that referenced
this pull request
Jul 5, 2016
* 'master' of git://github.com/mne-tools/mne-python: (48 commits) FIX: Flake fix pep8 [MRG] FIX Topographic plotting for KIT-UMD data (mne-tools#3349) QUICKFIX: logging test Error message for simulate evoked. (mne-tools#3372) Warnings for big bems. (mne-tools#3374) Add test for baseline correction. Use apply_baseline in read_evokeds. Makes (None, 0) the default value baseline in apply_baseline. [FIX] Adds apply_baseline to Evoked fix component inds in ica tutorial (mne-tools#3379) FIX: Xdawn with shuffled epochs (mne-tools#3373) FIX consistency: Epochs.load_data() should always return self (mne-tools#3376) MRG: Build relevant examples (mne-tools#3365) [MRG] set vmin, vmax after smoothing in plot_epochs_image (mne-tools#3360) [FIX] Attempt to fix circle. fixing a bg plotting bug for topo plots Modified test and tutorial. [MRG] convert surface using python. (mne-tools#3273) [MRG] raw.plot_psd() with flat channel (mne-tools#3342) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
sklearn.cross_validation.ShuffleSplitshuffle the epochs order and broke Xdawn.cc @kaichogami @alexandrebarachant