Change concatenation involving sparse matrices, sparse vectors and de… (

JuliaLang#16722) * Change concatenation involving sparse matrices, sparse vectors and dense vectors to return sparse arrays. * Change working in sparsevec test, and add Vector to union in hvcat.
abalkin · Jun 10, 2016 · 1111732 · 1111732
1 parent 4f65737
commit 1111732
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/base/array.jl b/base/array.jl
@@ -721,6 +721,14 @@ hcat{T}(A::Matrix{T}...) = typed_hcat(T, A...)
 vcat(A::Matrix...) = typed_vcat(promote_eltype(A...), A...)
 vcat{T}(A::Matrix{T}...) = typed_vcat(T, A...)
 
+hcat(A::Union{Matrix, Vector}...) = typed_hcat(promote_eltype(A...), A...)
+hcat{T}(A::Union{Matrix{T}, Vector{T}}...) = typed_hcat(T, A...)
+
+
+vcat(A::Union{Matrix, Vector}...) = typed_vcat(promote_eltype(A...), A...)
+vcat{T}(A::Union{Matrix{T}, Vector{T}}...) = typed_vcat(T, A...)
+
+
 hvcat(rows::Tuple{Vararg{Int}}, xs::Matrix...) = typed_hvcat(promote_eltype(xs...), rows, xs...)
 hvcat{T}(rows::Tuple{Vararg{Int}}, xs::Matrix{T}...) = typed_hvcat(T, rows, xs...)
 

diff --git a/base/sparse/sparsematrix.jl b/base/sparse/sparsematrix.jl
@@ -2901,17 +2901,17 @@ end
 
 # Sparse/dense concatenation
 
-function hcat(Xin::Union{Matrix, SparseMatrixCSC}...)
+function hcat(Xin::Union{Vector, Matrix, SparseMatrixCSC}...)
     X = SparseMatrixCSC[issparse(x) ? x : sparse(x) for x in Xin]
     hcat(X...)
 end
 
-function vcat(Xin::Union{Matrix, SparseMatrixCSC}...)
+function vcat(Xin::Union{Vector, Matrix, SparseMatrixCSC}...)
     X = SparseMatrixCSC[issparse(x) ? x : sparse(x) for x in Xin]
     vcat(X...)
 end
 
-function hvcat(rows::Tuple{Vararg{Int}}, X::Union{Matrix, SparseMatrixCSC}...)
+function hvcat(rows::Tuple{Vararg{Int}}, X::Union{Vector, Matrix, SparseMatrixCSC}...)
     nbr = length(rows)  # number of block rows
 
     tmp_rows = Array{SparseMatrixCSC}(nbr)

diff --git a/base/sparse/sparsevector.jl b/base/sparse/sparsevector.jl
@@ -755,6 +755,11 @@ function vcat{Tv,Ti}(X::AbstractSparseVector{Tv,Ti}...)
     SparseVector(len, rnzind, rnzval)
 end
 
+hcat(Xin::Union{AbstractSparseVector, SparseMatrixCSC}...) = hcat(map(SparseMatrixCSC, Xin)...)
+vcat(Xin::Union{AbstractSparseVector, SparseMatrixCSC}...) = vcat(map(SparseMatrixCSC, Xin)...)
+hcat(Xin::Union{Vector, AbstractSparseVector}...) = hcat(map(sparse, Xin)...)
+vcat(Xin::Union{Vector, AbstractSparseVector}...) = vcat(map(sparse, Xin)...)
+
 ### math functions
 
 ### Unary Map

diff --git a/test/sparsedir/sparse.jl b/test/sparsedir/sparse.jl
@@ -1381,10 +1381,6 @@ end
 @test issparse([sprand(10,10,.1) rand(10,10)])
 @test issparse([sprand(10,10,.1); rand(10,10)])
 @test issparse([sprand(10,10,.1) rand(10,10); rand(10,10) rand(10,10)])
-#---
-# Matrix vector cat not supported for sparse #13130
-#@test issparse([sprand(10,10,.1) rand(10)])
-#@test issparse([sprand(10,10,.1) sprand(10,.1)])
 # ---
 @test !issparse([rand(10,10)  rand(10,10)])
 @test !issparse([rand(10,10); rand(10,10)])

diff --git a/test/sparsedir/sparsevector.jl b/test/sparsedir/sparsevector.jl
@@ -988,3 +988,15 @@ for Tv in [Float32, Float64, Int64, Int32, Complex128]
         end
     end
 end
+
+# ref 13130 and 16661
+@test issparse([sprand(10,10,.1) sprand(10,.1)])
+@test issparse([sprand(10,1,.1); sprand(10,.1)])
+
+@test issparse([sprand(10,10,.1) rand(10)])
+@test issparse([sprand(10,1,.1)  rand(10)])
+@test issparse([sprand(10,2,.1) sprand(10,1,.1) rand(10)])
+@test issparse([sprand(10,1,.1); rand(10)])
+
+@test issparse([sprand(10,.1)  rand(10)])
+@test issparse([sprand(10,.1); rand(10)])