Skip to content

remove vcat(A::Vector{<: MatrixElem}) #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 24, 2019
Merged

remove vcat(A::Vector{<: MatrixElem}) #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions src/generic/Matrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4765,14 +4765,10 @@ function vcat(a::AbstractAlgebra.MatElem, b::AbstractAlgebra.MatElem)
end

@doc Markdown.doc"""
vcat(A::Vector{<: MatrixElem}) -> MatrixElem
> Return the horizontal concatenation of the matrices in $A$.
vcat(A::MatrixElem...) -> MatrixElem
> Return the horizontal concatenation of the matrices $A$.
> All component matrices need to have the same base ring and number of columns.
"""
function vcat(A::Vector{<: MatrixElem})
return _vcat(A)
end

function Base.vcat(A::MatrixElem...)
return _vcat(A)
end
Expand All @@ -4785,7 +4781,7 @@ function _vcat(A)
if any(x -> ncols(x) != ncols(A[1]), A)
error("Matrices must have the same number of columns")
end

if any(x -> base_ring(x) != base_ring(A[1]), A)
error("Matrices must have the same base ring")
end
Expand All @@ -4804,23 +4800,23 @@ function _vcat(A)
end

@doc Markdown.doc"""
hcat(A::Vector{<: MatrixElem}) -> MatrixElem
> Return the horizontal concatenating of the matrices in $A$.
hcat(A::MatrixElem...) -> MatrixElem
> Return the horizontal concatenating of the matrices $A$.
> All component matrices need to have the same base ring and number of rows.
"""
function hcat(A::Vector{<: MatrixElem})
function Base.hcat(A::MatrixElem...)
return _hcat(A)
end

function _hcat(A)
if length(A) == 0
error("Number of matrices to concatenate must be positive")
end

if any(x -> nrows(x) != nrows(A[1]), A)
error("Matrices must have the same number of rows")
end

if any(x -> base_ring(x) != base_ring(A[1]), A)
error("Matrices must have the same base ring")
end
Expand All @@ -4838,14 +4834,10 @@ function _hcat(A)
return M
end

function Base.hcat(A::MatrixElem...)
return _hcat(A)
end

function Base.cat(A::MatrixElem...;dims)
function Base.cat(A::MatrixElem...;dims)
@assert dims == (1,2) || isa(dims, Int)

if isa(dims, Int)
if isa(dims, Int)
if dims == 1
return hcat(A...)
elseif dims == 2
Expand Down
13 changes: 11 additions & 2 deletions test/generic/Matrix-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,7 +1651,11 @@ function test_gen_mat_concat()
0 1 0;
0 1 2;])
@test hcat(B, C) == [B C]
@test hcat([B, C]) == [B C]
let BC = hcat([B, C])
@test size(BC) == (2, 1)
@test BC[1] == B
@test BC[2] == C
end

@test vcat(A, B) == matrix(R, [1 2;
3 4;
Expand All @@ -1661,7 +1665,12 @@ function test_gen_mat_concat()
0 1;])

@test vcat(A, B) == [A; B]
@test vcat(A, B) == vcat([A, B])
let AB = vcat([A, B])
@test size(AB) == (2,)
@test AB[1] == A
@test AB[2] == B
end


@test [A D; B B C] == matrix(R, [1 2 1 2 3;
3 4 4 5 6;
Expand Down