Skip to content

fix some convert methods that depwarned #23494

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
fredrikekre merged 1 commit into from
Aug 29, 2017
Merged

fix some convert methods that depwarned #23494

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
17 changes: 9 additions & 8 deletions base/linalg/special.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
# Methods operating on different special matrix types

# Interconversion between special matrix types
convert(::Type{Bidiagonal}, A::Diagonal{T}) where {T} =
Bidiagonal(A.diag, zeros(T, size(A.diag,1)-1), :U)
convert(::Type{SymTridiagonal}, A::Diagonal{T}) where {T} =
SymTridiagonal(A.diag, zeros(T, size(A.diag,1)-1))
convert(::Type{Tridiagonal}, A::Diagonal{T}) where {T} =
Tridiagonal(zeros(T, size(A.diag,1)-1), A.diag, zeros(T, size(A.diag,1)-1))
convert(::Type{Bidiagonal}, A::Diagonal) =
Bidiagonal(A.diag, fill!(similar(A.diag, length(A.diag)-1), 0), :U)
convert(::Type{SymTridiagonal}, A::Diagonal) =
SymTridiagonal(A.diag, fill!(similar(A.diag, length(A.diag)-1), 0))
convert(::Type{Tridiagonal}, A::Diagonal) =
Tridiagonal(fill!(similar(A.diag, length(A.diag)-1), 0), A.diag,
fill!(similar(A.diag, length(A.diag)-1), 0))

function convert(::Type{Diagonal}, A::Union{Bidiagonal, SymTridiagonal})
if !iszero(A.ev)
Expand All @@ -25,8 +26,8 @@ function convert(::Type{SymTridiagonal}, A::Bidiagonal)
end

convert(::Type{Tridiagonal}, A::Bidiagonal{T}) where {T} =
Tridiagonal(A.uplo == 'U' ? zeros(T, size(A.dv,1)-1) : A.ev, A.dv,
A.uplo == 'U' ? A.ev : zeros(T, size(A.dv,1)-1))
Tridiagonal(A.uplo == 'U' ? fill!(similar(A.ev), 0) : A.ev, A.dv,
A.uplo == 'U' ? A.ev : fill!(similar(A.ev), 0))

function convert(::Type{Bidiagonal}, A::SymTridiagonal)
if !iszero(A.ev)
Expand Down
2 changes: 2 additions & 0 deletions base/test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,4 +1422,6 @@ Base.size(a::GenericArray) = size(a.a)
Base.getindex(a::GenericArray, i...) = a.a[i...]
Base.setindex!(a::GenericArray, x, i...) = a.a[i...] = x

Base.similar(A::GenericArray, s::Integer...) = GenericArray(similar(A.a, s...))

end # module
1 change: 1 addition & 0 deletions test/linalg/special.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ srand(1)
A = Diagonal(a)
@testset for newtype in [Diagonal, Bidiagonal, SymTridiagonal, Tridiagonal, Matrix]
@test full(convert(newtype, A)) == full(A)
@test full(convert(newtype, Diagonal(GenericArray(a)))) == full(A)
end

@testset for isupper in (true, false)
Expand Down