This is an automated email from the git hooks/post-receive script. yoh pushed a commit to tag 0.4 in repository python-mne.
commit 4afa43d3686f6a8a0cfe7374757630e4ee7b2c8e Author: Alexandre Gramfort <[email protected]> Date: Wed Jul 11 08:48:46 2012 +0200 TST : add test for n_events average fix with no preload --- mne/epochs.py | 1 + mne/tests/test_epochs.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mne/epochs.py b/mne/epochs.py index 51a33f8..a49f60d 100644 --- a/mne/epochs.py +++ b/mne/epochs.py @@ -411,6 +411,7 @@ class Epochs(object): if self.preload: n_events = len(self.events) data = np.mean(self._data, axis=0) + assert len(self.events) == len(self._data) else: data = np.zeros((n_channels, n_times)) n_events = 0 diff --git a/mne/tests/test_epochs.py b/mne/tests/test_epochs.py index ddc82c9..29bfc1c 100644 --- a/mne/tests/test_epochs.py +++ b/mne/tests/test_epochs.py @@ -84,16 +84,17 @@ def test_reject_epochs(): def test_preload_epochs(): """Test of epochs rejection """ - epochs = Epochs(raw, events[:12], event_id, tmin, tmax, picks=picks, + epochs_preload = Epochs(raw, events[:16], event_id, tmin, tmax, picks=picks, baseline=(None, 0), preload=True, reject=reject, flat=flat) - data_preload = epochs.get_data() + data_preload = epochs_preload.get_data() - epochs = Epochs(raw, events[:12], event_id, tmin, tmax, picks=picks, + epochs = Epochs(raw, events[:16], event_id, tmin, tmax, picks=picks, baseline=(None, 0), preload=False, reject=reject, flat=flat) - data_no_preload = epochs.get_data() - assert_array_equal(data_preload, data_no_preload) + data = epochs.get_data() + assert_array_equal(data_preload, data) + assert_array_equal(epochs_preload.average().data, epochs.average().data) def test_indexing_slicing(): -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
