diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-09-24 14:37:13 +0200 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-09-24 14:37:13 +0200 |
| commit | 27d6b4daf90488e105d70f45e5d5684b8f1a906d (patch) | |
| tree | 53d709495df6ad1b25f7159da29a1f237d07a126 /Eigen/src/Eigenvalues | |
| parent | 446001ef51be920649cb4f3c07848967b6788532 (diff) | |
Tridiagonalization::diagonal() and ::subDiagonal() did not work. Added unit-test
Diffstat (limited to 'Eigen/src/Eigenvalues')
| -rw-r--r-- | Eigen/src/Eigenvalues/Tridiagonalization.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Eigen/src/Eigenvalues/Tridiagonalization.h b/Eigen/src/Eigenvalues/Tridiagonalization.h index f20528f86..bedd1cb34 100644 --- a/Eigen/src/Eigenvalues/Tridiagonalization.h +++ b/Eigen/src/Eigenvalues/Tridiagonalization.h @@ -91,10 +91,8 @@ template<typename _MatrixType> class Tridiagonalization >::type DiagonalReturnType; typedef typename internal::conditional<NumTraits<Scalar>::IsComplex, - typename internal::add_const_on_value_type<typename Diagonal< - Block<const MatrixType,SizeMinusOne,SizeMinusOne> >::RealReturnType>::type, - const Diagonal< - Block<const MatrixType,SizeMinusOne,SizeMinusOne> > + typename internal::add_const_on_value_type<typename Diagonal<const MatrixType, -1>::RealReturnType>::type, + const Diagonal<const MatrixType, -1> >::type SubDiagonalReturnType; /** \brief Return type of matrixQ() */ @@ -307,7 +305,7 @@ typename Tridiagonalization<MatrixType>::DiagonalReturnType Tridiagonalization<MatrixType>::diagonal() const { eigen_assert(m_isInitialized && "Tridiagonalization is not initialized."); - return m_matrix.diagonal(); + return m_matrix.diagonal().real(); } template<typename MatrixType> @@ -315,8 +313,7 @@ typename Tridiagonalization<MatrixType>::SubDiagonalReturnType Tridiagonalization<MatrixType>::subDiagonal() const { eigen_assert(m_isInitialized && "Tridiagonalization is not initialized."); - Index n = m_matrix.rows(); - return Block<const MatrixType,SizeMinusOne,SizeMinusOne>(m_matrix, 1, 0, n-1,n-1).diagonal(); + return m_matrix.template diagonal<-1>().real(); } namespace internal { |