Skip to content

Conversation

@jaeilepp
Copy link
Contributor

@jaeilepp jaeilepp commented Jul 1, 2016

This is for testing the circle caching, but I thought I'd tackle an issue in the meantime.
Closes #3370
See if this is good enough.

@jaeilepp
Copy link
Contributor Author

jaeilepp commented Jul 1, 2016

Looks like the caching is somewhat working. For PRs it is using the cache of the fork of the user. For this PR it only had a subset of the datasets because I had been playing around with the cache on my other branch. This could actually be the root of our problems somehow.

@codecov-io
Copy link

codecov-io commented Jul 1, 2016

Current coverage is 86.67%

Merging #3372 into master will decrease coverage by <.01%

@@             master      #3372   diff @@
==========================================
  Files           335        335          
  Lines         57635      57639     +4   
  Methods           0          0          
  Messages          0          0          
  Branches       8782       8783     +1   
==========================================
+ Hits          49959      49961     +2   
- Misses         5001       5002     +1   
- Partials       2675       2676     +1   

Sunburst

Powered by Codecov. Last updated by 0623de9...0981a0a

noise = simulate_noise_evoked(evoked, cov, iir_filter, random_state)
evoked_noise = add_noise_evoked(evoked, noise, snr,
tmin=tmin, tmax=tmax)
if evoked.data.shape != noise.data.shape:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check should probably be in add_noise_evoked somewhere, and also it should probably check that the set of channels is the same, not just that the data sizes are the same

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... or actually I guess the error should be in simulate_noise_evoked

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In simulate_noise_evoked we essentially just do

noise = evoked.copy()
noise.data = noise_data

, so the channels are actually the same anyway. Maybe this needs a more thorough look.

@jaeilepp
Copy link
Contributor Author

jaeilepp commented Jul 4, 2016

Comment addressed.

@larsoner
Copy link
Member

larsoner commented Jul 4, 2016

LGTM can you add a test?

@jaeilepp
Copy link
Contributor Author

jaeilepp commented Jul 4, 2016

can you add a test?

Done.

@agramfort agramfort merged commit abbc097 into mne-tools:master Jul 4, 2016
@agramfort
Copy link
Member

thx @jaeilepp

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants