GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-13 00:21:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

disable the optimized 3x3 path for complexes which was not working at all

Browse Source
This commit is contained in:
Gael Guennebaud 2010-07-16 18:22:00 +02:00
parent 6ab9e8632f
commit 883a8cbb2c
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Eigen/src/Eigenvalues/Tridiagonalization.h
View File

@ -384,7 +384,9 @@ void ei_tridiagonalization_inplace(MatrixType& matA, CoeffVectorType& hCoeffs)
} }
// forward declaration, implementation at the end of this file // forward declaration, implementation at the end of this file
template<typename MatrixType, int Size=MatrixType::ColsAtCompileTime> template<typename MatrixType,
int Size=MatrixType::ColsAtCompileTime,
bool IsComplex=NumTraits<typename MatrixType::Scalar>::IsComplex>
struct ei_tridiagonalization_inplace_selector; struct ei_tridiagonalization_inplace_selector;
/** \brief Performs a full tridiagonalization in place /** \brief Performs a full tridiagonalization in place
@ -439,7 +441,7 @@ void ei_tridiagonalization_inplace(MatrixType& mat, DiagonalType& diag, SubDiago
/** \internal /** \internal
* General full tridiagonalization * General full tridiagonalization
*/ */
template<typename MatrixType, int Size> template<typename MatrixType, int Size, bool IsComplex>
struct ei_tridiagonalization_inplace_selector struct ei_tridiagonalization_inplace_selector
{ {
typedef typename Tridiagonalization<MatrixType>::CoeffVectorType CoeffVectorType; typedef typename Tridiagonalization<MatrixType>::CoeffVectorType CoeffVectorType;
@ -462,7 +464,7 @@ struct ei_tridiagonalization_inplace_selector
* Especially useful for plane fitting. * Especially useful for plane fitting.
*/ */
template<typename MatrixType> template<typename MatrixType>
struct ei_tridiagonalization_inplace_selector<MatrixType,3> struct ei_tridiagonalization_inplace_selector<MatrixType,3,false>
{ {
typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::Scalar Scalar;
typedef typename MatrixType::RealScalar RealScalar; typedef typename MatrixType::RealScalar RealScalar;
@ -470,14 +472,14 @@ struct ei_tridiagonalization_inplace_selector<MatrixType,3>
template<typename DiagonalType, typename SubDiagonalType> template<typename DiagonalType, typename SubDiagonalType>
static void run(MatrixType& mat, DiagonalType& diag, SubDiagonalType& subdiag, bool extractQ) static void run(MatrixType& mat, DiagonalType& diag, SubDiagonalType& subdiag, bool extractQ)
{ {
diag[0] = ei_real(mat(0,0)); diag[0] = mat(0,0);
RealScalar v1norm2 = ei_abs2(mat(2,0)); RealScalar v1norm2 = ei_abs2(mat(2,0));
if(v1norm2 == RealScalar(0) && ei_imag(mat(1,0))==RealScalar(0)) if(v1norm2 == RealScalar(0))
{ {
diag[1] = ei_real(mat(1,1)); diag[1] = mat(1,1);
diag[2] = ei_real(mat(2,2)); diag[2] = mat(2,2);
subdiag[0] = ei_real(mat(1,0)); subdiag[0] = mat(1,0);
subdiag[1] = ei_real(mat(2,1)); subdiag[1] = mat(2,1);
if (extractQ) if (extractQ)
mat.setIdentity(); mat.setIdentity();
} }
@ -485,13 +487,13 @@ struct ei_tridiagonalization_inplace_selector<MatrixType,3>
{ {
RealScalar beta = ei_sqrt(ei_abs2(mat(1,0)) + v1norm2); RealScalar beta = ei_sqrt(ei_abs2(mat(1,0)) + v1norm2);
RealScalar invBeta = RealScalar(1)/beta; RealScalar invBeta = RealScalar(1)/beta;
Scalar m01 = ei_conj(mat(1,0)) * invBeta; Scalar m01 = mat(1,0) * invBeta;
Scalar m02 = ei_conj(mat(2,0)) * invBeta; Scalar m02 = mat(2,0) * invBeta;
Scalar q = RealScalar(2)*m01*ei_conj(mat(2,1)) + m02*(mat(2,2) - mat(1,1)); Scalar q = RealScalar(2)*m01*mat(2,1) + m02*(mat(2,2) - mat(1,1));
diag[1] = ei_real(mat(1,1) + m02*q); diag[1] = mat(1,1) + m02*q;
diag[2] = ei_real(mat(2,2) - m02*q); diag[2] = mat(2,2) - m02*q;
subdiag[0] = beta; subdiag[0] = beta;
subdiag[1] = ei_real(ei_conj(mat(2,1)) - m01 * q); subdiag[1] = mat(2,1) - m01 * q;
if (extractQ) if (extractQ)
{ {
mat << 1, 0, 0, mat << 1, 0, 0,