[Scipy-svn] r6306 - trunk/scipy/linalg
scipy-svn at scipy.org
scipy-svn at scipy.org
Mon Apr 5 20:14:20 EDT 2010
Author: warren.weckesser
Date: 2010-04-05 19:14:20 -0500 (Mon, 05 Apr 2010)
New Revision: 6306
Modified:
trunk/scipy/linalg/basic.py
trunk/scipy/linalg/decomp.py
trunk/scipy/linalg/matfuncs.py
Log:
STY: linalg: Use False and True instead of 0 and 1.
Modified: trunk/scipy/linalg/basic.py
===================================================================
--- trunk/scipy/linalg/basic.py 2010-04-05 23:36:38 UTC (rev 6305)
+++ trunk/scipy/linalg/basic.py 2010-04-06 00:14:20 UTC (rev 6306)
@@ -31,7 +31,7 @@
import decomp
-def lu_solve((lu, piv), b, trans=0, overwrite_b=0):
+def lu_solve((lu, piv), b, trans=0, overwrite_b=False):
"""Solve an equation system, a x = b, given the LU factorization of a
Parameters
@@ -72,7 +72,7 @@
raise ValueError,\
'illegal value in %-th argument of internal gesv|posv'%(-info)
-def cho_solve((c, lower), b, overwrite_b=0):
+def cho_solve((c, lower), b, overwrite_b=False):
"""Solve an equation system, a x = b, given the Cholesky factorization of a
Parameters
@@ -104,8 +104,8 @@
'illegal value in %-th argument of internal gesv|posv'%(-info)
# Linear equations
-def solve(a, b, sym_pos=0, lower=0, overwrite_a=0, overwrite_b=0,
- debug = 0):
+def solve(a, b, sym_pos=False, lower=False, overwrite_a=False, overwrite_b=False,
+ debug=False):
"""Solve the equation a x = b for x
Parameters
@@ -159,8 +159,8 @@
raise ValueError,\
'illegal value in %-th argument of internal gesv|posv'%(-info)
-def solve_banded((l,u), ab, b, overwrite_ab=0, overwrite_b=0,
- debug = 0):
+def solve_banded((l,u), ab, b, overwrite_ab=False, overwrite_b=False,
+ debug=False):
"""Solve the equation a x = b for x, assuming a is banded matrix.
The matrix a is stored in ab using the matrix diagonal orded form::
@@ -217,8 +217,8 @@
raise ValueError,\
'illegal value in %-th argument of internal gbsv'%(-info)
-def solveh_banded(ab, b, overwrite_ab=0, overwrite_b=0,
- lower=0):
+def solveh_banded(ab, b, overwrite_ab=False, overwrite_b=False,
+ lower=False):
"""Solve equation a x = b. a is Hermitian positive-definite banded matrix.
The matrix a is stored in ab either in lower diagonal or upper
@@ -280,7 +280,7 @@
raise ValueError,\
'illegal value in %d-th argument of internal pbsv'%(-info)
-def cholesky_banded(ab, overwrite_ab=0, lower=0):
+def cholesky_banded(ab, overwrite_ab=False, lower=False):
"""Cholesky decompose a banded Hermitian positive-definite matrix
The matrix a is stored in ab either in lower diagonal or upper
@@ -332,7 +332,7 @@
# matrix inversion
-def inv(a, overwrite_a=0):
+def inv(a, overwrite_a=False):
"""Compute the inverse of a matrix.
Parameters
@@ -406,7 +406,7 @@
### Determinant
-def det(a, overwrite_a=0):
+def det(a, overwrite_a=False):
"""Compute the determinant of a matrix
Parameters
@@ -434,7 +434,7 @@
### Linear Least Squares
-def lstsq(a, b, cond=None, overwrite_a=0, overwrite_b=0):
+def lstsq(a, b, cond=None, overwrite_a=False, overwrite_b=False):
"""Compute least-squares solution to equation :m:`a x = b`
Compute a vector x such that the 2-norm :m:`|b - a x|` is minimised.
Modified: trunk/scipy/linalg/decomp.py
===================================================================
--- trunk/scipy/linalg/decomp.py 2010-04-05 23:36:38 UTC (rev 6305)
+++ trunk/scipy/linalg/decomp.py 2010-04-06 00:14:20 UTC (rev 6306)
@@ -396,7 +396,7 @@
" and no eigenvalues or eigenvectors were"
" computed." % (info-b1.shape[0]))
-def eig_banded(a_band, lower=0, eigvals_only=0, overwrite_a_band=0,
+def eig_banded(a_band, lower=False, eigvals_only=False, overwrite_a_band=False,
select='a', select_range=None, max_ev = 0):
"""Solve real symmetric or complex hermetian band matrix eigenvalue problem.
@@ -544,7 +544,7 @@
return w
return w, v
-def eigvals(a,b=None,overwrite_a=0):
+def eigvals(a, b=None, overwrite_a=False):
"""Compute eigenvalues from an ordinary or generalized eigenvalue problem.
Find eigenvalues of a general matrix::
@@ -641,7 +641,7 @@
overwrite_a=overwrite_a, overwrite_b=overwrite_b,
turbo=turbo, eigvals=eigvals, type=type)
-def eigvals_banded(a_band,lower=0,overwrite_a_band=0,
+def eigvals_banded(a_band, lower=False, overwrite_a_band=False,
select='a', select_range=None):
"""Solve real symmetric or complex hermitian band matrix eigenvalue problem.
@@ -711,7 +711,7 @@
overwrite_a_band=overwrite_a_band, select=select,
select_range=select_range)
-def lu_factor(a, overwrite_a=0):
+def lu_factor(a, overwrite_a=False):
"""Compute pivoted LU decomposition of a matrix.
The decomposition is::
@@ -758,7 +758,7 @@
RuntimeWarning)
return lu, piv
-def lu_solve(a_lu_pivots,b):
+def lu_solve(a_lu_pivots, b):
"""Solve an equation system, a x = b, given the LU factorization of a
Parameters
@@ -795,7 +795,7 @@
return b
-def lu(a,permute_l=0,overwrite_a=0):
+def lu(a, permute_l=False, overwrite_a=False):
"""Compute pivoted LU decompostion of a matrix.
The decomposition is::
@@ -849,7 +849,7 @@
return l,u
return p,l,u
-def svd(a,full_matrices=1,compute_uv=1,overwrite_a=0):
+def svd(a, full_matrices=True, compute_uv=True, overwrite_a=False):
"""Singular Value Decomposition.
Factorizes the matrix a into two unitary matrices U and Vh and
@@ -929,7 +929,7 @@
else:
return s
-def svdvals(a,overwrite_a=0):
+def svdvals(a, overwrite_a=False):
"""Compute singular values of a matrix.
Parameters
@@ -954,7 +954,7 @@
"""
return svd(a,compute_uv=0,overwrite_a=overwrite_a)
-def diagsvd(s,M,N):
+def diagsvd(s, M, N):
"""Construct the sigma matrix in SVD from singular values and size M,N.
Parameters
@@ -981,7 +981,7 @@
else:
raise ValueError, "Length of s must be M or N."
-def cholesky(a,lower=0,overwrite_a=0):
+def cholesky(a, lower=False, overwrite_a=False):
"""Compute the Cholesky decomposition of a matrix.
Returns the Cholesky decomposition, :lm:`A = L L^*` or :lm:`A = U^* U`
@@ -1028,7 +1028,7 @@
'illegal value in %-th argument of internal potrf'%(-info)
return c
-def cho_factor(a, lower=0, overwrite_a=0):
+def cho_factor(a, lower=False, overwrite_a=False):
"""Compute the Cholesky decomposition of a matrix, to use in cho_solve
Returns a matrix containing the Cholesky decomposition,
@@ -1115,7 +1115,7 @@
raise TypeError, msg
return b
-def qr(a, overwrite_a=0, lwork=None, econ=None, mode='qr'):
+def qr(a, overwrite_a=False, lwork=None, econ=None, mode='qr'):
"""Compute QR decomposition of a matrix.
Calculate the decomposition :lm:`A = Q R` where Q is unitary/orthogonal
@@ -1237,7 +1237,7 @@
-def qr_old(a,overwrite_a=0,lwork=None):
+def qr_old(a, overwrite_a=False, lwork=None):
"""Compute QR decomposition of a matrix.
Calculate the decomposition :lm:`A = Q R` where Q is unitary/orthogonal
@@ -1291,7 +1291,7 @@
-def rq(a,overwrite_a=0,lwork=None):
+def rq(a, overwrite_a=False, lwork=None):
"""Compute RQ decomposition of a square real matrix.
Calculate the decomposition :lm:`A = R Q` where Q is unitary/orthogonal
@@ -1353,7 +1353,7 @@
_double_precision = ['i','l','d']
-def schur(a,output='real',lwork=None,overwrite_a=0):
+def schur(a, output='real', lwork=None, overwrite_a=False):
"""Compute Schur decomposition of a matrix.
The Schur decomposition is
@@ -1421,6 +1421,7 @@
_array_kind = {'b':0, 'h':0, 'B': 0, 'i':0, 'l': 0, 'f': 0, 'd': 0, 'F': 1, 'D': 1}
_array_precision = {'i': 1, 'l': 1, 'f': 0, 'd': 1, 'F': 0, 'D': 1}
_array_type = [['f', 'd'], ['F', 'D']]
+
def _commonType(*arrays):
kind = 0
precision = 0
@@ -1533,7 +1534,7 @@
Q = u[:,:num]
return Q
-def hessenberg(a,calc_q=0,overwrite_a=0):
+def hessenberg(a, calc_q=False, overwrite_a=False):
"""Compute Hessenberg form of a matrix.
The Hessenberg decomposition is
Modified: trunk/scipy/linalg/matfuncs.py
===================================================================
--- trunk/scipy/linalg/matfuncs.py 2010-04-05 23:36:38 UTC (rev 6305)
+++ trunk/scipy/linalg/matfuncs.py 2010-04-06 00:14:20 UTC (rev 6306)
@@ -19,7 +19,7 @@
eps = np.finfo(float).eps
feps = np.finfo(single).eps
-def expm(A,q=7):
+def expm(A, q=7):
"""Compute the matrix exponential using Pade approximation.
Parameters
@@ -89,7 +89,7 @@
vri = inv(vr)
return dot(dot(vr,diag(exp(s))),vri).astype(t)
-def expm3(A,q=20):
+def expm3(A, q=20):
"""Compute the matrix exponential using Taylor series.
Parameters
@@ -120,7 +120,8 @@
return eA
_array_precision = {'i': 1, 'l': 1, 'f': 0, 'd': 1, 'F': 0, 'D': 1}
-def toreal(arr,tol=None):
+
+def toreal(arr, tol=None):
"""Return as real array if imaginary part is small.
Parameters
@@ -267,7 +268,7 @@
else:
return solve(coshm(A), sinhm(A))
-def funm(A,func,disp=1):
+def funm(A, func, disp=True):
"""Evaluate a matrix function specified by a callable.
Returns the value of matrix-valued function f at A. The function f
@@ -342,7 +343,7 @@
else:
return F, err
-def logm(A,disp=1):
+def logm(A, disp=True):
"""Compute matrix logarithm.
The matrix logarithm is the inverse of expm: expm(logm(A)) == A
@@ -393,7 +394,7 @@
else:
return F, errest
-def signm(a,disp=1):
+def signm(a, disp=True):
"""Matrix sign function.
Extension of the scalar sign(x) to matrices.
@@ -470,7 +471,7 @@
else:
return S0, errest
-def sqrtm(A,disp=1):
+def sqrtm(A, disp=True):
"""Matrix square root.
Parameters
More information about the Scipy-svn
mailing list