[Scipy-svn] r3693 - trunk/scipy/sparse/tests

scipy-svn at scipy.org scipy-svn at scipy.org
Thu Dec 20 16:42:01 EST 2007


Author: wnbell
Date: 2007-12-20 15:41:58 -0600 (Thu, 20 Dec 2007)
New Revision: 3693

Modified:
   trunk/scipy/sparse/tests/test_sparse.py
Log:
small edit


Modified: trunk/scipy/sparse/tests/test_sparse.py
===================================================================
--- trunk/scipy/sparse/tests/test_sparse.py	2007-12-20 21:16:22 UTC (rev 3692)
+++ trunk/scipy/sparse/tests/test_sparse.py	2007-12-20 21:41:58 UTC (rev 3693)
@@ -38,17 +38,18 @@
 class TestSparseTools(NumpyTestCase):
     """Simple benchmarks for sparse matrix module"""
 
-    def test_arithmetic(self,level=5):
+    def test_arithmetic(self,level=4):
         matrices = []
         matrices.append( ('A','Identity', spidentity(500**2,format='csr')) )
         matrices.append( ('B','Poisson5pt', poisson2d(500,format='csr'))  )
    
         #matrices = [ (a,b,c.astype('int8')) for (a,b,c) in matrices ]
+
         print
         print '                 Sparse Matrix Arithmetic'
-        print '==================================================================='
-        print ' var |     name       |         shape        |   dtype   |    nnz  '
-        print '-------------------------------------------------------------------'
+        print '===================================================================='
+        print ' var |     name       |         shape        |   dtype   |    nnz   '
+        print '--------------------------------------------------------------------'
         fmt = '  %1s  | %14s | %20s | %9s | %8d '
 
         for var,name,mat in matrices:
@@ -85,12 +86,6 @@
                     print fmt % (format,operation,msec_per_it)
 
 
-#            name = name.center(12)
-#            shape = ("%s" % (A.shape,)).center(20)
-#            MFLOPs = (2*A.nnz*iter/(end-start))/float(1e6)
-#
-#            print fmt % (A.format,name,shape,A.nnz,MFLOPs)
-
     def test_matvec(self,level=5):
         matrices = []
         matrices.append(('Identity',   spidentity(10**5,format='csr')))




More information about the Scipy-svn mailing list