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

[scipy-svn at scipy.org]

Author: wnbell
Date: 2007-12-29 14:37:12 -0600 (Sat, 29 Dec 2007)
New Revision: 3746

Modified:
   trunk/scipy/sparse/construct.py
Log:
small edit to spkron


Modified: trunk/scipy/sparse/construct.py
===================================================================
--- trunk/scipy/sparse/construct.py	2007-12-29 20:35:32 UTC (rev 3745)
+++ trunk/scipy/sparse/construct.py	2007-12-29 20:37:12 UTC (rev 3746)
@@ -114,7 +114,7 @@
     B = coo_matrix(B)
 
     
-    if 2*B.nnz >= B.shape[0] * B.shape[1]:
+    if (format is None or format == "bsr") and 2*B.nnz >= B.shape[0] * B.shape[1]:
         #B is fairly dense, use BSR
         A = csr_matrix(A,copy=True)