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 46dd988df00b973d6c3fc588bfdde2afac814c97 Author: Alexandre Gramfort <[email protected]> Date: Tue Feb 28 08:33:23 2012 +0100 ENH : more permissive test for evoked algebra --- mne/fiff/evoked.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mne/fiff/evoked.py b/mne/fiff/evoked.py index 394dfc4..643f77b 100644 --- a/mne/fiff/evoked.py +++ b/mne/fiff/evoked.py @@ -364,8 +364,9 @@ def merge_evoked(all_evoked): for e in all_evoked[1:]: assert e.ch_names == ch_names, ValueError("%s and %s do not contain " "the same channels" % (evoked, e)) - assert np.all(e.times == evoked.times), ValueError("%s and %s do not " - "contain the same time instants" % (evoked, e)) + assert np.max(np.abs(e.times - evoked.times)) < 1e-7, \ + ValueError("%s and %s do not " + "contain the same time instants" % (evoked, e)) all_nave = sum(e.nave for e in all_evoked) evoked.data = sum(e.nave * e.data for e in all_evoked) / all_nave -- 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
