spzeros now requires both, rows and columns.

Fix #5436
JuliaLang · Jan 18, 2014 · c3e3329 · c3e3329
1 parent 296e917
commit c3e3329
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -380,5 +380,8 @@ eval(Sys, :(@deprecate shlib_list dllist))
 @deprecate degrees2radians deg2rad
 @deprecate radians2degrees rad2deg
 
+@deprecate spzeros(m::Integer) spzeros(m, m)
+@deprecate spzeros(Tv::Type, m::Integer) spzeros(Tv, m, m)
+
 # 0.3 discontinued functions
 
diff --git a/base/sparse/sparsematrix.jl b/base/sparse/sparsematrix.jl
@@ -119,7 +119,7 @@ copy(S::SparseMatrixCSC) =
 similar(S::SparseMatrixCSC, Tv::NonTupleType) =
     SparseMatrixCSC(S.m, S.n, similar(S.colptr), similar(S.rowval), Array(Tv, length(S.rowval)))
 
-similar(S::SparseMatrixCSC, Tv::Type, d::(Int,Int)) = spzeros(Tv, d[1], d[2])
+similar(S::SparseMatrixCSC, Tv::Type, d::(Integer,Integer)) = spzeros(Tv, d[1], d[2])
 
 function similar(A::SparseMatrixCSC, Tv::Type, Ti::Type)
     colptrA = A.colptr; rowvalA = A.rowval; nzvalA = A.nzval
@@ -404,9 +404,7 @@ sprandbool(m::Integer, n::Integer, density::FloatingPoint) = sprand(m,n,density,
 spones{T}(S::SparseMatrixCSC{T}) =
      SparseMatrixCSC(S.m, S.n, copy(S.colptr), copy(S.rowval), ones(T, S.colptr[end]-1))
 
-spzeros(m::Integer) = spzeros(m, m)
 spzeros(m::Integer, n::Integer) = spzeros(Float64, m, n)
-spzeros(Tv::Type, m::Integer) = spzeros(Tv, m, m)
 spzeros(Tv::Type, m::Integer, n::Integer) =
     SparseMatrixCSC(m, n, ones(Int, n+1), Array(Int, 0), Array(Tv, 0))
 spzeros(Tv::Type, Ti::Type, m::Integer, n::Integer) =

diff --git a/test/sparse.jl b/test/sparse.jl
@@ -30,7 +30,7 @@ se33_i32 = speye(Int32, 3, 3)
 @test all([se44 sz42 sz41_f32; sz34 se33_i32] == se77)
 
 # check mixed sparse-dense concatenation
-sz33 = spzeros(3)
+sz33 = spzeros(3, 3)
 de33 = eye(3)
 @test  all([se33 de33; sz33 se33] == full([se33 se33; sz33 se33 ]))