[Scipy-svn] r4647 - in trunk/scipy: . sparse/linalg/eigen/lobpcg/tests sparse/linalg/isolve

[scipy-svn at scipy.org]

Author: jarrod.millman
Date: 2008-08-16 19:28:59 -0500 (Sat, 16 Aug 2008)
New Revision: 4647

Removed:
   trunk/scipy/sandbox/
Modified:
   trunk/scipy/__init__.py
   trunk/scipy/setup.py
   trunk/scipy/setupscons.py
   trunk/scipy/sparse/linalg/eigen/lobpcg/tests/benchmark.py
   trunk/scipy/sparse/linalg/isolve/minres.py
Log:
remove sandbox


Modified: trunk/scipy/__init__.py
===================================================================
--- trunk/scipy/__init__.py	2008-08-17 00:13:32 UTC (rev 4646)
+++ trunk/scipy/__init__.py	2008-08-17 00:28:59 UTC (rev 4647)
@@ -66,7 +66,7 @@
 # Remove subpackage names from __all__ such that they are not imported via
 # "from scipy import *". This works around a numpy bug present in < 1.2.
 subpackages = """cluster constants fftpack integrate interpolate io lib linalg
-linsolve maxentropy misc ndimage odr optimize sandbox signal sparse special
+linsolve maxentropy misc ndimage odr optimize signal sparse special
 splinalg stats stsci weave""".split()
 for name in subpackages:
     try:

Modified: trunk/scipy/setup.py
===================================================================
--- trunk/scipy/setup.py	2008-08-17 00:13:32 UTC (rev 4646)
+++ trunk/scipy/setup.py	2008-08-17 00:28:59 UTC (rev 4647)
@@ -15,7 +15,6 @@
     config.add_subpackage('misc')
     config.add_subpackage('odr')
     config.add_subpackage('optimize')
-    config.add_subpackage('sandbox')
     config.add_subpackage('signal')
     config.add_subpackage('sparse')
     config.add_subpackage('special')

Modified: trunk/scipy/setupscons.py
===================================================================
--- trunk/scipy/setupscons.py	2008-08-17 00:13:32 UTC (rev 4646)
+++ trunk/scipy/setupscons.py	2008-08-17 00:28:59 UTC (rev 4647)
@@ -19,7 +19,6 @@
     config.add_subpackage('misc')
     config.add_subpackage('odr')
     config.add_subpackage('optimize')
-    config.add_subpackage('sandbox')
     config.add_subpackage('signal')
     config.add_subpackage('sparse')
     config.add_subpackage('special')

Modified: trunk/scipy/sparse/linalg/eigen/lobpcg/tests/benchmark.py
===================================================================
--- trunk/scipy/sparse/linalg/eigen/lobpcg/tests/benchmark.py	2008-08-17 00:13:32 UTC (rev 4646)
+++ trunk/scipy/sparse/linalg/eigen/lobpcg/tests/benchmark.py	2008-08-17 00:28:59 UTC (rev 4647)
@@ -1,5 +1,5 @@
 from scipy import *
-from scipy.sandbox import lobpcg
+from scipy.sparese.linalg import lobpcg
 from symeig import symeig
 from pylab import plot, show, legend, xlabel, ylabel
 set_printoptions(precision=3,linewidth=90)

Modified: trunk/scipy/sparse/linalg/isolve/minres.py
===================================================================
--- trunk/scipy/sparse/linalg/isolve/minres.py	2008-08-17 00:13:32 UTC (rev 4646)
+++ trunk/scipy/sparse/linalg/isolve/minres.py	2008-08-17 00:28:59 UTC (rev 4647)
@@ -281,7 +281,6 @@
     from scipy.linalg import norm
     from scipy.sparse import spdiags
     from scipy.sparse.linalg import cg
-    #from scipy.sandbox.multigrid import *
 
     n = 10