Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MRG, FIX: Fix for singleton and efficiency #7469

Merged
merged 1 commit into from
Mar 17, 2020

Conversation

larsoner
Copy link
Member

An attempt to recover some commits from the rolled-back #7257. In theory this should fix CircleCI in master. Tests pass locally, let's see if the CIs agree. This refactors _brain to make several improvements:

  1. smoothing_matrix is only used in one place
  2. time interpolation is only constructed once (in one place) and reused
  3. singleton dimensions are hopefully handled properly

@GuillaumeFavelier if things are green I think we should merge this, then maybe bring back the rest of #7257 ?

Copy link
Member

@agramfort agramfort left a comment

Choose a reason for hiding this comment

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

provided it fixes CIs

@codecov
Copy link

codecov bot commented Mar 17, 2020

Codecov Report

Merging #7469 into master will decrease coverage by 0.00%.
The diff coverage is 93.77%.

@@            Coverage Diff             @@
##           master    #7469      +/-   ##
==========================================
- Coverage   90.08%   90.08%   -0.01%     
==========================================
  Files         454      454              
  Lines       82562    82539      -23     
  Branches    13351    13051     -300     
==========================================
- Hits        74375    74353      -22     
- Misses       5348     5360      +12     
+ Partials     2839     2826      -13     

@agramfort agramfort merged commit 25f6e5e into mne-tools:master Mar 17, 2020
@agramfort
Copy link
Member

thx @larsoner

@larsoner larsoner deleted the interp branch March 17, 2020 22:51
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.

2 participants