Skip to content

Commit

Permalink
Change working in sparsevec test, and add Vector to union in hvcat.
Browse files Browse the repository at this point in the history
  • Loading branch information
pkofod committed Jun 3, 2016
1 parent d88da42 commit 9398849
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion base/sparse/sparsematrix.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2911,7 +2911,7 @@ function vcat(Xin::Union{Vector, Matrix, SparseMatrixCSC}...)
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)
Expand Down
2 changes: 1 addition & 1 deletion test/sparsedir/sparsevector.jl
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ for Tv in [Float32, Float64, Int64, Int32, Complex128]
end
end

# Matrix vector cat not supported for sparse #13130 and #16661
# ref 13130 and 16661
@test issparse([sprand(10,10,.1) sprand(10,.1)])
@test issparse([sprand(10,1,.1); sprand(10,.1)])

Expand Down

0 comments on commit 9398849

Please sign in to comment.