Skip to content

Commit

Permalink
FIX: Botched rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner committed Sep 11, 2017
1 parent 3c96a3d commit 62b9f8e
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions mne/viz/tests/test_evoked.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,6 @@ def test_plot_evoked():
contrast["blue/stim"] = blue
plot_compare_evokeds(contrast, picks=[0], colors=['r', 'b'],
ylim=dict(mag=(1, 10)), ci=_parametric_ci)
# isolated test of CI functions
arr = np.linspace(0, 1, 1000)[..., np.newaxis]
assert_allclose(_ci(arr, method="parametric"),
_ci(arr, method="bootstrap"), rtol=.005)
assert_allclose(_bootstrap_ci(arr, statfun="median", random_state=0),
_bootstrap_ci(arr, statfun="mean", random_state=0),
rtol=.1)

# Hack to test plotting of maxfiltered data
evoked_sss = evoked.copy()
Expand Down

0 comments on commit 62b9f8e

Please sign in to comment.