Some functions have been moved from scipy to numpy. Updated import statements to reflect this.
This commit is contained in:
parent
d0f307c135
commit
660f649670
|
@ -11,7 +11,7 @@ import laydi
|
||||||
from laydi import plots, main,logger
|
from laydi import plots, main,logger
|
||||||
import scipy
|
import scipy
|
||||||
from scipy import dot,sum,diag,arange,log,newaxis,sqrt,apply_along_axis,empty
|
from scipy import dot,sum,diag,arange,log,newaxis,sqrt,apply_along_axis,empty
|
||||||
from scipy.stats import corrcoef
|
from numpy import corrcoef
|
||||||
|
|
||||||
def correlation_loadings(data, T, test=True):
|
def correlation_loadings(data, T, test=True):
|
||||||
""" Returns correlation loadings.
|
""" Returns correlation loadings.
|
||||||
|
|
|
@ -5,7 +5,7 @@ from scipy import zeros,zeros_like,sqrt,dot,trace,sign,round_,argmax,\
|
||||||
sort,ravel,newaxis,asarray,diag,sum,outer,argsort,arange,ones_like,\
|
sort,ravel,newaxis,asarray,diag,sum,outer,argsort,arange,ones_like,\
|
||||||
all,apply_along_axis,eye,atleast_2d,empty
|
all,apply_along_axis,eye,atleast_2d,empty
|
||||||
from scipy.linalg import svd,inv,norm,det,sqrtm
|
from scipy.linalg import svd,inv,norm,det,sqrtm
|
||||||
from scipy.stats import median
|
from numpy import median
|
||||||
|
|
||||||
#import plots_lpls
|
#import plots_lpls
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ from scipy import apply_along_axis,newaxis,zeros,\
|
||||||
trace,zeros_like,sign,sort,real,argsort,rand,array,\
|
trace,zeros_like,sign,sort,real,argsort,rand,array,\
|
||||||
matrix,nan
|
matrix,nan
|
||||||
from scipy.linalg import norm,svd,inv,eig
|
from scipy.linalg import norm,svd,inv,eig
|
||||||
from scipy.stats import median
|
from numpy import median
|
||||||
|
|
||||||
def normalise(a, axis=0, return_scales=False):
|
def normalise(a, axis=0, return_scales=False):
|
||||||
s = apply_along_axis(norm, axis, a)
|
s = apply_along_axis(norm, axis, a)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"""
|
"""
|
||||||
from scipy import ones,sqrt,dot,newaxis,zeros,sum,empty,\
|
from scipy import ones,sqrt,dot,newaxis,zeros,sum,empty,\
|
||||||
apply_along_axis,eye,kron,array,sort,zeros_like,argmax,atleast_2d
|
apply_along_axis,eye,kron,array,sort,zeros_like,argmax,atleast_2d
|
||||||
from scipy.stats import median
|
from numpy import median
|
||||||
from scipy.linalg import triu,inv,svd,norm
|
from scipy.linalg import triu,inv,svd,norm
|
||||||
|
|
||||||
from select_generators import w_pls_gen,w_pls_gen_jk,pls_gen,pca_gen,diag_pert
|
from select_generators import w_pls_gen,w_pls_gen_jk,pls_gen,pca_gen,diag_pert
|
||||||
|
|
Reference in New Issue