GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #4

Browse Source 
and also improve performance of Tridiag::diag/subDiag at the same time
This commit is contained in:
Gael Guennebaud 2009-05-23 13:31:20 +00:00
parent 42848498aa
commit 9d5728c511
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Eigen/src/QR/Tridiagonalization.h
View File

@ -60,10 +60,17 @@ template<typename _MatrixType> class Tridiagonalization
typedef Matrix<RealScalar, Size, 1> DiagonalType; typedef Matrix<RealScalar, Size, 1> DiagonalType;
typedef Matrix<RealScalar, SizeMinusOne, 1> SubDiagonalType; typedef Matrix<RealScalar, SizeMinusOne, 1> SubDiagonalType;
typedef typename NestByValue<Diagonal<MatrixType,0> >::RealReturnType DiagonalReturnType; typedef typename ei_meta_if<NumTraits<Scalar>::IsComplex,
typename NestByValue<Diagonal<MatrixType,0> >::RealReturnType,
Diagonal<MatrixType,0>
>::ret DiagonalReturnType;
typedef typename NestByValue<Diagonal< typedef typename ei_meta_if<NumTraits<Scalar>::IsComplex,
NestByValue<Block<MatrixType,SizeMinusOne,SizeMinusOne> >,0 > >::RealReturnType SubDiagonalReturnType; typename NestByValue<Diagonal<
NestByValue<Block<MatrixType,SizeMinusOne,SizeMinusOne> >,0 > >::RealReturnType,
Diagonal<
NestByValue<Block<MatrixType,SizeMinusOne,SizeMinusOne> >,0 >
>::ret SubDiagonalReturnType;
/** This constructor initializes a Tridiagonalization object for /** This constructor initializes a Tridiagonalization object for
* further use with Tridiagonalization::compute() * further use with Tridiagonalization::compute()
@ -136,7 +143,7 @@ template<typename MatrixType>
const typename Tridiagonalization<MatrixType>::DiagonalReturnType const typename Tridiagonalization<MatrixType>::DiagonalReturnType
Tridiagonalization<MatrixType>::diagonal(void) const Tridiagonalization<MatrixType>::diagonal(void) const
{ {
return m_matrix.diagonal().nestByValue().real(); return m_matrix.diagonal().nestByValue();
} }
/** \returns an expression of the sub-diagonal vector */ /** \returns an expression of the sub-diagonal vector */
@ -146,7 +153,7 @@ Tridiagonalization<MatrixType>::subDiagonal(void) const
{ {
int n = m_matrix.rows(); int n = m_matrix.rows();
return Block<MatrixType,SizeMinusOne,SizeMinusOne>(m_matrix, 1, 0, n-1,n-1) return Block<MatrixType,SizeMinusOne,SizeMinusOne>(m_matrix, 1, 0, n-1,n-1)
.nestByValue().diagonal().nestByValue().real(); .nestByValue().diagonal().nestByValue();
} }
/** constructs and returns the tridiagonal matrix T. /** constructs and returns the tridiagonal matrix T.