[Scipy-svn] r3833 - trunk/scipy/sparse

[scipy-svn at scipy.org]

Author: wnbell
Date: 2008-01-14 14:27:02 -0600 (Mon, 14 Jan 2008)
New Revision: 3833

Modified:
   trunk/scipy/sparse/bsr.py
   trunk/scipy/sparse/coo.py
   trunk/scipy/sparse/csc.py
   trunk/scipy/sparse/csr.py
   trunk/scipy/sparse/dia.py
Log:
make doctests work the same on 32/64-bit platforms


Modified: trunk/scipy/sparse/bsr.py
===================================================================
--- trunk/scipy/sparse/bsr.py	2008-01-14 20:01:29 UTC (rev 3832)
+++ trunk/scipy/sparse/bsr.py	2008-01-14 20:27:02 UTC (rev 3833)
@@ -62,10 +62,10 @@
 
     >>> from scipy.sparse import *
     >>> from scipy import *
-    >>> bsr_matrix( (3,4), dtype='int32' ).todense()
+    >>> bsr_matrix( (3,4), dtype=int8 ).todense()
     matrix([[0, 0, 0, 0],
             [0, 0, 0, 0],
-            [0, 0, 0, 0]], dtype=int32)
+            [0, 0, 0, 0]], dtype=int8)
 
     >>> row  = array([0,0,1,2,2,2])
     >>> col  = array([0,2,2,0,1,2])

Modified: trunk/scipy/sparse/coo.py
===================================================================
--- trunk/scipy/sparse/coo.py	2008-01-14 20:01:29 UTC (rev 3832)
+++ trunk/scipy/sparse/coo.py	2008-01-14 20:27:02 UTC (rev 3833)
@@ -70,10 +70,10 @@
 
     >>> from scipy.sparse import *
     >>> from scipy import *
-    >>> coo_matrix( (3,4), dtype='int32' ).todense()
+    >>> coo_matrix( (3,4), dtype=int8 ).todense()
     matrix([[0, 0, 0, 0],
             [0, 0, 0, 0],
-            [0, 0, 0, 0]], dtype=int32)
+            [0, 0, 0, 0]], dtype=int8)
 
     >>> row  = array([0,3,1,0])
     >>> col  = array([0,3,1,2])

Modified: trunk/scipy/sparse/csc.py
===================================================================
--- trunk/scipy/sparse/csc.py	2008-01-14 20:01:29 UTC (rev 3832)
+++ trunk/scipy/sparse/csc.py	2008-01-14 20:27:02 UTC (rev 3833)
@@ -63,10 +63,10 @@
 
     >>> from scipy.sparse import *
     >>> from scipy import *
-    >>> csc_matrix( (3,4), dtype='int32' ).todense()
+    >>> csc_matrix( (3,4), dtype=int8 ).todense()
     matrix([[0, 0, 0, 0],
             [0, 0, 0, 0],
-            [0, 0, 0, 0]], dtype=int32)
+            [0, 0, 0, 0]], dtype=int8)
 
     >>> row = array([0,2,2,0,1,2])
     >>> col = array([0,0,1,2,2,2])

Modified: trunk/scipy/sparse/csr.py
===================================================================
--- trunk/scipy/sparse/csr.py	2008-01-14 20:01:29 UTC (rev 3832)
+++ trunk/scipy/sparse/csr.py	2008-01-14 20:27:02 UTC (rev 3833)
@@ -65,10 +65,10 @@
 
     >>> from scipy.sparse import *
     >>> from scipy import *
-    >>> csr_matrix( (3,4), dtype='int32' ).todense()
+    >>> csr_matrix( (3,4), dtype=int8 ).todense()
     matrix([[0, 0, 0, 0],
             [0, 0, 0, 0],
-            [0, 0, 0, 0]], dtype=int32)
+            [0, 0, 0, 0]], dtype=int8)
 
     >>> row = array([0,0,1,2,2,2])
     >>> col = array([0,2,2,0,1,2])

Modified: trunk/scipy/sparse/dia.py
===================================================================
--- trunk/scipy/sparse/dia.py	2008-01-14 20:01:29 UTC (rev 3832)
+++ trunk/scipy/sparse/dia.py	2008-01-14 20:27:02 UTC (rev 3833)
@@ -34,10 +34,10 @@
 
     >>> from scipy.sparse import *
     >>> from scipy import *
-    >>> dia_matrix( (3,4), dtype='int32').todense()
+    >>> dia_matrix( (3,4), dtype=int8).todense()
     matrix([[0, 0, 0, 0],
             [0, 0, 0, 0],
-            [0, 0, 0, 0]], dtype=int32)
+            [0, 0, 0, 0]], dtype=int8)
     
     >>> data = array([[1,2,3,4]]).repeat(3,axis=0)
     >>> diags = array([0,-1,2])