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

[scipy-svn at scipy.org]

Author: josef
Date: 2008-12-17 20:51:45 -0600 (Wed, 17 Dec 2008)
New Revision: 5274

Modified:
   trunk/scipy/optimize/__init__.py
   trunk/scipy/optimize/info.py
Log:
add nnls to optimize __all__ and info

Modified: trunk/scipy/optimize/__init__.py
===================================================================
--- trunk/scipy/optimize/__init__.py	2008-12-17 01:37:08 UTC (rev 5273)
+++ trunk/scipy/optimize/__init__.py	2008-12-18 02:51:45 UTC (rev 5274)
@@ -14,6 +14,7 @@
 from nonlin import broyden1, broyden2, broyden3, broyden_generalized, \
     anderson, anderson2
 from slsqp import fmin_slsqp
+from nnls import nnls
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
 from numpy.testing import Tester

Modified: trunk/scipy/optimize/info.py
===================================================================
--- trunk/scipy/optimize/info.py	2008-12-17 01:37:08 UTC (rev 5273)
+++ trunk/scipy/optimize/info.py	2008-12-18 02:51:45 UTC (rev 5274)
@@ -27,6 +27,9 @@
 
    fmin_cobyla   -- Constrained Optimization BY Linear Approximation
 
+   nnls          -- Solve linear least squares problem with non-negativity
+                      constraint
+
 Global Optimizers::
 
    anneal      --  Simulated Annealing