Merge pull request #10042 from JuliaLang/tk/fix-bidiag-convert

Fix conversion from Bidiagonal to Tridiagonal
JuliaLang · Feb 3, 2015 · dcfc3fc · dcfc3fc
2 parents 3f865d6 + ea79109
commit dcfc3fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/base/linalg/bidiag.jl b/base/linalg/bidiag.jl
@@ -43,7 +43,7 @@ promote_rule{T,S}(::Type{Matrix{T}}, ::Type{Bidiagonal{S}})=Matrix{promote_type(
 Tridiagonal{T}(M::Bidiagonal{T}) = convert(Tridiagonal{T}, M)
 function convert{T}(::Type{Tridiagonal{T}}, A::Bidiagonal{T})
     z = zeros(T, size(A)[1]-1)
-    A.isupper ? Tridiagonal(A.ev, A.dv, z) : Tridiagonal(z, A.dv, A.ev)
+    A.isupper ? Tridiagonal(z, A.dv, A.ev) : Tridiagonal(A.ev, A.dv, z)
 end
 promote_rule{T,S}(::Type{Tridiagonal{T}}, ::Type{Bidiagonal{S}})=Tridiagonal{promote_type(T,S)}
 

diff --git a/test/linalg4.jl b/test/linalg4.jl
@@ -175,11 +175,13 @@ for isupper in (true, false)
     for newtype in [Bidiagonal, Tridiagonal, isupper ? UpperTriangular : LowerTriangular, Matrix]
         debug && println("newtype is $(newtype)")
         @test full(convert(newtype, A)) == full(A)
+        @test full(newtype(A)) == full(A)
     end
     A=Bidiagonal(a, zeros(n-1), isupper) #morally Diagonal
     for newtype in [Diagonal, Bidiagonal, SymTridiagonal, Tridiagonal, isupper ? UpperTriangular : LowerTriangular, Matrix]
         debug && println("newtype is $(newtype)")
         @test full(convert(newtype, A)) == full(A)
+        @test full(newtype(A)) == full(A)
     end
 end