[Scipy-svn] r3380 - in trunk/scipy/sandbox/multigrid: . tests

scipy-svn@scip... scipy-svn@scip...
Fri Sep 28 15:58:08 CDT 2007


Author: wnbell
Date: 2007-09-28 15:58:04 -0500 (Fri, 28 Sep 2007)
New Revision: 3380

Modified:
   trunk/scipy/sandbox/multigrid/setup.py
   trunk/scipy/sandbox/multigrid/tests/test_coarsen.py
Log:
disabled code that uses examples


Modified: trunk/scipy/sandbox/multigrid/setup.py
===================================================================
--- trunk/scipy/sandbox/multigrid/setup.py	2007-09-28 19:41:17 UTC (rev 3379)
+++ trunk/scipy/sandbox/multigrid/setup.py	2007-09-28 20:58:04 UTC (rev 3380)
@@ -10,6 +10,7 @@
     config = Configuration('multigrid',parent_package,top_path)
 
     config.add_data_dir('tests')
+    config.add_data_dir(join('tests','sample_data'))
 
     # Adding a Python file as a "source" file for an extension is something of
     # a hack, but it works to put it in the right place.

Modified: trunk/scipy/sandbox/multigrid/tests/test_coarsen.py
===================================================================
--- trunk/scipy/sandbox/multigrid/tests/test_coarsen.py	2007-09-28 19:41:17 UTC (rev 3379)
+++ trunk/scipy/sandbox/multigrid/tests/test_coarsen.py	2007-09-28 20:58:04 UTC (rev 3380)
@@ -146,16 +146,16 @@
                 S_expected = reference_sa_constant_interpolation(A,epsilon)
                 assert_array_equal(S_result.todense(),S_expected.todense())
 
-    def check_sample_data(self):
-        from examples import all_examples,read_matrix
+##    def check_sample_data(self):
+##        from examples import all_examples,read_matrix
+##
+##        for filename in all_examples:
+##            A = read_matrix(filename)            
+##            for epsilon in [0.0,0.08,0.51,1.0]:
+##                S_result   = sa_constant_interpolation(A,epsilon)
+##                S_expected = reference_sa_constant_interpolation(A,epsilon)
+##                assert_array_equal((S_result - S_expected).nnz,0)
 
-        for filename in all_examples:
-            A = read_matrix(filename)            
-            for epsilon in [0.0,0.08,0.51,1.0]:
-                S_result   = sa_constant_interpolation(A,epsilon)
-                S_expected = reference_sa_constant_interpolation(A,epsilon)
-                assert_array_equal((S_result - S_expected).nnz,0)
-
 if __name__ == '__main__':
     NumpyTest().run()
 



More information about the Scipy-svn mailing list