[Scipy-svn] r6825 - trunk/scipy/optimize

scipy-svn@scip... scipy-svn@scip...
Sat Sep 25 21:51:26 CDT 2010


Author: warren.weckesser
Date: 2010-09-25 21:51:25 -0500 (Sat, 25 Sep 2010)
New Revision: 6825

Modified:
   trunk/scipy/optimize/minpack.py
Log:
Removed commented code accidentally left in the previous commit.

Modified: trunk/scipy/optimize/minpack.py
===================================================================
--- trunk/scipy/optimize/minpack.py	2010-09-26 02:48:28 UTC (rev 6824)
+++ trunk/scipy/optimize/minpack.py	2010-09-26 02:51:25 UTC (rev 6825)
@@ -113,7 +113,6 @@
     n = len(x0)
     if type(args) != type(()): args = (args,)
     _check_func('fsolve', 'func', func, x0, args, n, (n,))
-    #check_func(func, x0, args, n, (n,))
     Dfun = fprime
     if Dfun is None:
         if band is None:
@@ -126,7 +125,6 @@
                 maxfev, ml, mu, epsfcn, factor, diag)
     else:
         _check_func('fsolve', 'fprime', Dfun, x0, args, n, (n,n))
-        # check_func(Dfun,x0,args,n,(n,n))
         if (maxfev == 0):
             maxfev = 100*(n + 1)
         retval = _minpack._hybrj(func, Dfun, x0, args, full_output,
@@ -261,7 +259,6 @@
     if type(args) != type(()):
         args = (args,)
     m = _check_func('leastsq', 'func', func, x0, args, n)[0]
-    # m = check_func(func, x0, args, n)[0]
     if n > m:
         raise TypeError('Improper input: N=%s must not exceed M=%s' % (n,m))
     if Dfun is None:
@@ -272,10 +269,8 @@
     else:
         if col_deriv:
             _check_func('leastsq', 'Dfun', Dfun, x0, args, n, (n,m))
-            # check_func(Dfun, x0, args, n, (n,m))
         else:
             _check_func('leastsq', 'Dfun', Dfun, x0, args, n, (m,n))
-            # check_func(Dfun, x0, args, n, (m,n))
         if (maxfev == 0):
             maxfev = 100*(n + 1)
         retval = _minpack._lmder(func, Dfun, x0, args, full_output, col_deriv,



More information about the Scipy-svn mailing list