Commit 49d5fd5a authored by Andrew Quinn's avatar Andrew Quinn
Browse files

More flake fixes

parent ed0fd079
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ Worker functions:
"""

import typing
import logging
import warnings
from dataclasses import dataclass

@@ -1994,18 +1993,14 @@ def glm_periodogram(X, covariates=None, confounds=None, fit_method='pinv',

    # Compute model - each method MUST assign copes, varcopes and extras
    if fit_method == 'pinv':
        #  Design matrix pseudo-inverse method
        copes, varcopes, extras = _glm_fit_simple(p, config)
    elif fit_method == 'lstsq':
        #  numpy.linalg.lstsq method
        copes, varcopes, extras = _glm_fit_simple(p, covariates, confounds, config,
                                                  fit_method='lstsq', fit_constant=fit_constant)
    elif fit_method == 'glmtools':
        # glmtools 
        copes, varcopes, extras = _glm_fit_glmtools(p, covariates, confounds, config,
                                                    fit_constant=fit_constant)
    elif _is_sklearn_estimator(fit_method):
        # sklearn
        copes, varcopes, extras = _glm_fit_sklearn_estimator(p, covariates, confounds, config,
                                                             fit_method=fit_method,
                                                             fit_constant=fit_constant)