Fix #7647.

Update eigmax, eigmin, eigmax interfaces for Symmetric and SymTridiagonal matrices to conform to new method signatures introduced in #6678.
JuliaLang · Jul 18, 2014 · 465b3d8 · 465b3d8
1 parent 67e7acb
commit 465b3d8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/base/linalg/symmetric.jl b/base/linalg/symmetric.jl
@@ -45,8 +45,8 @@ eigfact!{T<:BlasReal}(A::RealHermSymComplexHerm{T}, vl::Real, vh::Real) = Eigen(
 eigvals!{T<:BlasReal}(A::RealHermSymComplexHerm{T}) = LAPACK.syevr!('N', 'A', A.uplo, A.S, 0.0, 0.0, 0, 0, -1.0)[1]
 eigvals!{T<:BlasReal}(A::RealHermSymComplexHerm{T}, irange::UnitRange) = LAPACK.syevr!('N', 'I', A.uplo, A.S, 0.0, 0.0, irange.start, irange.stop, -1.0)[1]
 eigvals!{T<:BlasReal}(A::RealHermSymComplexHerm{T}, vl::Real, vh::Real) = LAPACK.syevr!('N', 'V', A.uplo, A.S, convert(T, vl), convert(T, vh), 0, 0, -1.0)[1]
-eigmax{T<:Real}(A::RealHermSymComplexHerm{T}) = eigvals(A, size(A, 1), size(A, 1))[1]
-eigmin{T<:Real}(A::RealHermSymComplexHerm{T}) = eigvals(A, 1, 1)[1]
+eigmax{T<:Real}(A::RealHermSymComplexHerm{T}) = eigvals(A, size(A, 1):size(A, 1))[1]
+eigmin{T<:Real}(A::RealHermSymComplexHerm{T}) = eigvals(A, 1:1)[1]
 
 function eigfact!{T<:BlasReal}(A::HermOrSym{T}, B::HermOrSym{T})
  vals, vecs, _ = LAPACK.sygvd!(1, 'V', A.uplo, A.S, B.uplo == A.uplo ? B.S : B.S')
@@ -65,4 +65,4 @@ function sqrtm{T<:Real}(A::RealHermSymComplexHerm{T})
  F = eigfact(A)
  isposdef(F) && return F.vectors*Diagonal(sqrt(F.values))*F.vectors'
  return F.vectors*Diagonal(sqrt(complex(F.values)))*F.vectors'
-end
+end
diff --git a/base/linalg/tridiag.jl b/base/linalg/tridiag.jl
@@ -66,8 +66,8 @@ eigvals!{T<:BlasFloat}(m::SymTridiagonal{T}, irange::UnitRange) = LAPACK.stegr!(
 eigvals!{T<:BlasFloat}(m::SymTridiagonal{T}, vl::Real, vu::Real) = LAPACK.stegr!('N', 'V', m.dv, m.ev, vl, vu, 0, 0)[1]
 
 #Computes largest and smallest eigenvalue
-eigmax(m::SymTridiagonal) = eigvals(m, size(m, 1), size(m, 1))[1]
-eigmin(m::SymTridiagonal) = eigvals(m, 1, 1)[1]
+eigmax(m::SymTridiagonal) = eigvals(m, size(m, 1):size(m, 1))[1]
+eigmin(m::SymTridiagonal) = eigvals(m, 1:1)[1]
 
 #Compute selected eigenvectors only corresponding to particular eigenvalues
 eigvecs(m::SymTridiagonal) = eigfact(m)[:vectors]

diff --git a/test/linalg4.jl b/test/linalg4.jl
@@ -170,6 +170,15 @@ for relty in (Float32, Float64), elty in (relty, )#XXX Complex{relty}) doesn't w
  end
 end
 
+#Issue #7647: test xsyevr, xheevr, xstevr drivers
+for Mi7647 in {Symmetric(diagm([1.0:3.0])), Hermitian(diagm([1.0:3.0])),
+ Hermitian(diagm(complex([1.0:3.0]))), SymTridiagonal([1.0:3.0], zeros(2))}
+ debug && println("Eigenvalues in interval for $(typeof(Mi7647))")
+ @test eigmin(Mi7647) == eigvals(Mi7647, 0.5, 1.5)[1] == 1.0
+ @test eigmax(Mi7647) == eigvals(Mi7647, 2.5, 3.5)[1] == 3.0
+ @test eigvals(Mi7647) == eigvals(Mi7647, 0.5, 3.5) == [1.0:3.0]
+end
+
 debug && println("Bidiagonal matrices")
 for relty in (Float32, Float64, BigFloat), elty in (relty, Complex{relty})
  debug && println("elty is $(elty), relty is $(relty)")
@@ -322,4 +331,3 @@ for newtype in [Diagonal, Bidiagonal, SymTridiagonal, Triangular, Matrix]
  @test full(convert(newtype, A)) == full(A)
 end
 
-