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

fix warning in Tridiag

Browse Source
This commit is contained in:
Gael Guennebaud 2009-03-09 10:41:37 +00:00
parent 44f218988c
commit 314aff875e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,7 @@ template<typename _MatrixType> class Tridiagonalization
{} {}
Tridiagonalization(const MatrixType& matrix) Tridiagonalization(const MatrixType& matrix)
: m_matrix(matrix), : m_matrix(matrix), m_hCoeffs(matrix.cols()-1)
m_hCoeffs(matrix.cols()-1)
{ {
_compute(m_matrix, m_hCoeffs); _compute(m_matrix, m_hCoeffs);
} }
@ -122,13 +121,12 @@ template<typename _MatrixType> class Tridiagonalization
static void decomposeInPlace(MatrixType& mat, DiagonalType& diag, SubDiagonalType& subdiag, bool extractQ = true); static void decomposeInPlace(MatrixType& mat, DiagonalType& diag, SubDiagonalType& subdiag, bool extractQ = true);
private:
static void _compute(MatrixType& matA, CoeffVectorType& hCoeffs); static void _compute(MatrixType& matA, CoeffVectorType& hCoeffs);
protected:
static void _decomposeInPlace3x3(MatrixType& mat, DiagonalType& diag, SubDiagonalType& subdiag, bool extractQ = true); static void _decomposeInPlace3x3(MatrixType& mat, DiagonalType& diag, SubDiagonalType& subdiag, bool extractQ = true);
protected:
MatrixType m_matrix; MatrixType m_matrix;
CoeffVectorType m_hCoeffs; CoeffVectorType m_hCoeffs;
}; };
@ -192,7 +190,6 @@ void Tridiagonalization<MatrixType>::_compute(MatrixType& matA, CoeffVectorType&
{ {
assert(matA.rows()==matA.cols()); assert(matA.rows()==matA.cols());
int n = matA.rows(); int n = matA.rows();
// std::cerr << matA << "\n\n";
for (int i = 0; i<n-2; ++i) for (int i = 0; i<n-2; ++i)
{ {
// let's consider the vector v = i-th column starting at position i+1 // let's consider the vector v = i-th column starting at position i+1
@ -220,7 +217,6 @@ void Tridiagonalization<MatrixType>::_compute(MatrixType& matA, CoeffVectorType&
// i.e., A = H' A H where H = I - h v v' and v = matA.col(i).end(n-i-1) // i.e., A = H' A H where H = I - h v v' and v = matA.col(i).end(n-i-1)
matA.col(i).coeffRef(i+1) = 1; matA.col(i).coeffRef(i+1) = 1;
Scalar* EIGEN_RESTRICT t = &hCoeffs.coeffRef(-1);
// hCoeffs.end(n-i-1) = (matA.corner(BottomRight,n-i-1,n-i-1).template part<LowerTriangular|SelfAdjoint>() // hCoeffs.end(n-i-1) = (matA.corner(BottomRight,n-i-1,n-i-1).template part<LowerTriangular|SelfAdjoint>()
// * matA.col(i).end(n-i-1)).lazy(); // * matA.col(i).end(n-i-1)).lazy();
@ -229,7 +225,7 @@ void Tridiagonalization<MatrixType>::_compute(MatrixType& matA, CoeffVectorType&
(n-i-1,matA.corner(BottomRight,n-i-1,n-i-1).data(), matA.stride(), matA.col(i).end(n-i-1).data(), const_cast<Scalar*>(hCoeffs.end(n-i-1).data())); (n-i-1,matA.corner(BottomRight,n-i-1,n-i-1).data(), matA.stride(), matA.col(i).end(n-i-1).data(), const_cast<Scalar*>(hCoeffs.end(n-i-1).data()));
hCoeffs.end(n-i-1) = hCoeffs.end(n-i-1)*h hCoeffs.end(n-i-1) = hCoeffs.end(n-i-1)*h
+ (h*ei_conj(h)*Scalar(-0.5)*matA.col(i).end(n-i-1).dot(hCoeffs.end(n-i-1))) * + (h*ei_conj(h)*Scalar(-0.5)*(matA.col(i).end(n-i-1).dot(hCoeffs.end(n-i-1)))) *
matA.col(i).end(n-i-1); matA.col(i).end(n-i-1);
// symmetric rank-2 update // symmetric rank-2 update