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

Eigensolver decomposition interface unification.

Browse Source 
Added default ctor and public compute method as
well as safe-guards against uninitialized usage.
Added unit tests for the safe-guards.
This commit is contained in:
Hauke Heibel 2009-05-22 14:27:58 +02:00
parent 7435d5c079
commit 0523b64fe9
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Eigen/src/QR/EigenSolver.h
View File

@ -53,9 +53,18 @@ template<typename _MatrixType> class EigenSolver
typedef Matrix<RealScalar, MatrixType::ColsAtCompileTime, 1> RealVectorType; typedef Matrix<RealScalar, MatrixType::ColsAtCompileTime, 1> RealVectorType;
typedef Matrix<RealScalar, Dynamic, 1> RealVectorTypeX; typedef Matrix<RealScalar, Dynamic, 1> RealVectorTypeX;
/**
* \brief Default Constructor.
*
* The default constructor is useful in cases in which the user intends to
* perform decompositions via EigenSolver::compute(const MatrixType&).
*/
EigenSolver() : m_eivec(), m_eivalues(), m_isInitialized(false) {}
EigenSolver(const MatrixType& matrix) EigenSolver(const MatrixType& matrix)
: m_eivec(matrix.rows(), matrix.cols()), : m_eivec(matrix.rows(), matrix.cols()),
m_eivalues(matrix.cols()) m_eivalues(matrix.cols()),
m_isInitialized(false)
{ {
compute(matrix); compute(matrix);
} }
@ -94,12 +103,20 @@ template<typename _MatrixType> class EigenSolver
* *
* \sa pseudoEigenvalueMatrix() * \sa pseudoEigenvalueMatrix()
*/ */
const MatrixType& pseudoEigenvectors() const { return m_eivec; } const MatrixType& pseudoEigenvectors() const
{
ei_assert(m_isInitialized && "EigenSolver is not initialized.");
return m_eivec;
}
MatrixType pseudoEigenvalueMatrix() const; MatrixType pseudoEigenvalueMatrix() const;
/** \returns the eigenvalues as a column vector */ /** \returns the eigenvalues as a column vector */
EigenvalueType eigenvalues() const { return m_eivalues; } EigenvalueType eigenvalues() const
{
ei_assert(m_isInitialized && "EigenSolver is not initialized.");
return m_eivalues;
}
void compute(const MatrixType& matrix); void compute(const MatrixType& matrix);
@ -111,6 +128,7 @@ template<typename _MatrixType> class EigenSolver
protected: protected:
MatrixType m_eivec; MatrixType m_eivec;
EigenvalueType m_eivalues; EigenvalueType m_eivalues;
bool m_isInitialized;
}; };
/** \returns the real block diagonal matrix D of the eigenvalues. /** \returns the real block diagonal matrix D of the eigenvalues.
@ -120,6 +138,7 @@ template<typename _MatrixType> class EigenSolver
template<typename MatrixType> template<typename MatrixType>
MatrixType EigenSolver<MatrixType>::pseudoEigenvalueMatrix() const MatrixType EigenSolver<MatrixType>::pseudoEigenvalueMatrix() const
{ {
ei_assert(m_isInitialized && "EigenSolver is not initialized.");
int n = m_eivec.cols(); int n = m_eivec.cols();
MatrixType matD = MatrixType::Zero(n,n); MatrixType matD = MatrixType::Zero(n,n);
for (int i=0; i<n; ++i) for (int i=0; i<n; ++i)
@ -143,6 +162,7 @@ MatrixType EigenSolver<MatrixType>::pseudoEigenvalueMatrix() const
template<typename MatrixType> template<typename MatrixType>
typename EigenSolver<MatrixType>::EigenvectorType EigenSolver<MatrixType>::eigenvectors(void) const typename EigenSolver<MatrixType>::EigenvectorType EigenSolver<MatrixType>::eigenvectors(void) const
{ {
ei_assert(m_isInitialized && "EigenSolver is not initialized.");
int n = m_eivec.cols(); int n = m_eivec.cols();
EigenvectorType matV(n,n); EigenvectorType matV(n,n);
for (int j=0; j<n; ++j) for (int j=0; j<n; ++j)
@ -183,6 +203,8 @@ void EigenSolver<MatrixType>::compute(const MatrixType& matrix)
// Reduce Hessenberg to real Schur form. // Reduce Hessenberg to real Schur form.
hqr2(matH); hqr2(matH);
m_isInitialized = true;
} }
// Nonsymmetric reduction to Hessenberg form. // Nonsymmetric reduction to Hessenberg form.

17
test/eigensolver_generic.cpp
View File

@ -61,6 +61,17 @@ template<typename MatrixType> void eigensolver(const MatrixType& m)
} }
template<typename MatrixType> void eigensolver_verify_assert()
{
MatrixType tmp;
EigenSolver<MatrixType> eig;
VERIFY_RAISES_ASSERT(eig.eigenvectors())
VERIFY_RAISES_ASSERT(eig.pseudoEigenvectors())
VERIFY_RAISES_ASSERT(eig.pseudoEigenvalueMatrix())
VERIFY_RAISES_ASSERT(eig.eigenvalues())
}
void test_eigensolver_generic() void test_eigensolver_generic()
{ {
for(int i = 0; i < g_repeat; i++) { for(int i = 0; i < g_repeat; i++) {
@ -73,5 +84,9 @@ void test_eigensolver_generic()
CALL_SUBTEST( eigensolver(Matrix<double,1,1>()) ); CALL_SUBTEST( eigensolver(Matrix<double,1,1>()) );
CALL_SUBTEST( eigensolver(Matrix<double,2,2>()) ); CALL_SUBTEST( eigensolver(Matrix<double,2,2>()) );
} }
}
CALL_SUBTEST( eigensolver_verify_assert<Matrix3f>() );
CALL_SUBTEST( eigensolver_verify_assert<Matrix3d>() );
CALL_SUBTEST( eigensolver_verify_assert<MatrixXf>() );
CALL_SUBTEST( eigensolver_verify_assert<MatrixXd>() );
}