[Scipy-svn] r6343 - trunk/scipy/sparse/linalg/isolve

[scipy-svn at scipy.org]

Author: ptvirtan
Date: 2010-04-27 16:46:38 -0500 (Tue, 27 Apr 2010)
New Revision: 6343

Modified:
   trunk/scipy/sparse/linalg/isolve/iterative.py
Log:
BUG: sparse.linalg.isolve: fix bug introduced by the GMRES restrt parameter rename

Modified: trunk/scipy/sparse/linalg/isolve/iterative.py
===================================================================
--- trunk/scipy/sparse/linalg/isolve/iterative.py	2010-04-27 16:52:51 UTC (rev 6342)
+++ trunk/scipy/sparse/linalg/isolve/iterative.py	2010-04-27 21:46:38 UTC (rev 6343)
@@ -319,10 +319,11 @@
         Starting guess for the solution.
     tol : float
         Relative tolerance to achieve before terminating.
-    restart : integer
+    restart : integer, optional
         Number of iterations between restarts. Larger values increase
         iteration cost, but may be necessary for convergence.
-    maxiter : integer
+        (Default: 20)
+    maxiter : integer, optional
         Maximum number of iterations.  Iteration will stop after maxiter
         steps even if the specified tolerance has not been achieved.
     M : {sparse matrix, dense matrix, LinearOperator}
@@ -373,6 +374,8 @@
     if maxiter is None:
         maxiter = n*10
 
+    if restrt is None:
+        restrt = 20
     restrt = min(restrt, n)
 
     matvec = A.matvec