Skip to content

make Diagonal+Symmetric return Symmetric #35333

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 4 commits into from
Apr 6, 2020
Merged

make Diagonal+Symmetric return Symmetric #35333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8031321
make Diagonal+Symmetric return Symmetric
dkarrasch Apr 1, 2020
e13b72a
introduce generic +/- AbstractMatrix with Diagonal
dkarrasch Apr 2, 2020
d716816
fix typos in tests
dkarrasch Apr 2, 2020
ce9354f
remove generic addition/subtraction with Diagonals
dkarrasch Apr 2, 2020
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
15 changes: 15 additions & 0 deletions stdlib/LinearAlgebra/src/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,21 @@ end
(+)(Da::Diagonal, Db::Diagonal) = Diagonal(Da.diag + Db.diag)
(-)(Da::Diagonal, Db::Diagonal) = Diagonal(Da.diag - Db.diag)

for f in (:+, :-)
@eval function $f(D::Diagonal, S::Symmetric)
return Symmetric($f(D, S.data), sym_uplo(S.uplo))
end
@eval function $f(S::Symmetric, D::Diagonal)
return Symmetric($f(S.data, D), sym_uplo(S.uplo))
end
@eval function $f(D::Diagonal{<:Real}, H::Hermitian)
return Hermitian($f(D, H.data), sym_uplo(H.uplo))
end
@eval function $f(H::Hermitian, D::Diagonal{<:Real})
return Hermitian($f(H.data, D), sym_uplo(H.uplo))
end
end

(*)(x::Number, D::Diagonal) = Diagonal(x * D.diag)
(*)(D::Diagonal, x::Number) = Diagonal(D.diag * x)
(/)(D::Diagonal, x::Number) = Diagonal(D.diag / x)
Expand Down
13 changes: 13 additions & 0 deletions stdlib/LinearAlgebra/test/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,19 @@ Random.seed!(1)
A = rand(elty, n, n)
Asym = Symmetric(A + transpose(A), :U)
Aherm = Hermitian(A + adjoint(A), :U)
for op in (+, -)
@test op(Asym, D) isa Symmetric
@test Array(op(Asym, D)) ≈ Array(Symmetric(op(Array(Asym), Array(D))))
@test op(D, Asym) isa Symmetric
@test Array(op(D, Asym)) ≈ Array(Symmetric(op(Array(D), Array(Asym))))
if !(elty <: Real)
Dr = real(D)
@test op(Aherm, Dr) isa Hermitian
@test Array(op(Aherm, Dr)) ≈ Array(Hermitian(op(Array(Aherm), Array(Dr))))
@test op(Dr, Aherm) isa Hermitian
@test Array(op(Dr, Aherm)) ≈ Array(Hermitian(op(Array(Dr), Array(Aherm))))
end
end
@test Array(D*Transpose(Asym)) ≈ Array(D) * Array(transpose(Asym))
@test Array(D*Adjoint(Asym)) ≈ Array(D) * Array(adjoint(Asym))
@test Array(D*Transpose(Aherm)) ≈ Array(D) * Array(transpose(Aherm))
Expand Down