From 910f7f7ea41d1603a23d16345f66a9422cb9a84d Mon Sep 17 00:00:00 2001 From: Martin Billinger Date: Thu, 5 May 2016 08:48:31 +0200 Subject: [PATCH] Import GeneratorType --- mne_sandbox/connectivity/mvar.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mne_sandbox/connectivity/mvar.py b/mne_sandbox/connectivity/mvar.py index c7e3a2b..88e2af1 100644 --- a/mne_sandbox/connectivity/mvar.py +++ b/mne_sandbox/connectivity/mvar.py @@ -5,6 +5,7 @@ from __future__ import division import numpy as np import logging +from types import GeneratorType from scot.varbase import VARBase from scot.var import VAR @@ -17,13 +18,6 @@ from mne.utils import logger, verbose -# todo: I'm sure we can import generator from somewhere... -def _generator(): - yield None -generator = type(_generator()) -del _generator - - def _autocorrelations(epochs, max_lag): return [acm(epochs, l) for l in range(max_lag + 1)] @@ -69,7 +63,7 @@ def _fit_mvar_yw(data, pmin, pmax, n_jobs, blocksize, verbose=None): 'automatic model order selection.') order = pmin - if not isinstance(data, generator): + if not isinstance(data, GeneratorType): blocksize = int(np.ceil(len(data) / n_jobs)) parallel, block_autocorrelations, _ = \