Commit b19ff867 authored by Andrew Quinn's avatar Andrew Quinn
Browse files

Merge branch 'glmspectrum_object' into 'master' 

GLM-Spectrum return object

See merge request !79
parents 9898658d ff25af4b

requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ numpy 
scipy

matplotlib

h5py

sklearn

scikit-learn

# importlib is pinned to keep py3.7 compatability, 3.8+ works unpinned.

importlib-metadata<5.0.0

sails/stats.py

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ def durbin_watson(residuals, step=1): 
        raise ValueError("residuals must be 1, 2 or 3D")



    # Calculation needs to be performed in the complex domain

    residuals = residuals.astype(np.complex)

    residuals = residuals.astype(complex)

    d_resid = residuals[:, :-step, :] - residuals[:, step:, :]



    # Combine all trials by flattening axes 0 and 1

sails/stft.py

+119 −99

File changed.

Preview size limit exceeded, changes collapsed.