mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-21 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug #897: fix regression in BiCGSTAB(mat) ctor (an all other iterative solvers).

Browse Source 
Add respective regression unit test.
This commit is contained in:
Gael Guennebaud 2015-02-16 17:05:10 +01:00
parent 470d26d580
commit 0f464d9d87
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
View File

@ -54,9 +54,10 @@ public:
*/ */
template<typename SparseMatrixDerived> template<typename SparseMatrixDerived>
explicit IterativeSolverBase(const SparseMatrixBase<SparseMatrixDerived>& A) explicit IterativeSolverBase(const SparseMatrixBase<SparseMatrixDerived>& A)
: mp_matrix(A)
{ {
init(); init();
compute(A.derived()); compute(mp_matrix);
} }
~IterativeSolverBase() {} ~IterativeSolverBase() {}
@ -69,7 +70,7 @@ public:
template<typename SparseMatrixDerived> template<typename SparseMatrixDerived>
Derived& analyzePattern(const SparseMatrixBase<SparseMatrixDerived>& A) Derived& analyzePattern(const SparseMatrixBase<SparseMatrixDerived>& A)
{ {
grab(A); grab(A.derived());
m_preconditioner.analyzePattern(mp_matrix); m_preconditioner.analyzePattern(mp_matrix);
m_isInitialized = true; m_isInitialized = true;
m_analysisIsOk = true; m_analysisIsOk = true;
@ -90,7 +91,7 @@ public:
Derived& factorize(const SparseMatrixBase<SparseMatrixDerived>& A) Derived& factorize(const SparseMatrixBase<SparseMatrixDerived>& A)
{ {
eigen_assert(m_analysisIsOk && "You must first call analyzePattern()"); eigen_assert(m_analysisIsOk && "You must first call analyzePattern()");
grab(A); grab(A.derived());
m_preconditioner.factorize(mp_matrix); m_preconditioner.factorize(mp_matrix);
m_factorizationIsOk = true; m_factorizationIsOk = true;
m_info = Success; m_info = Success;
@ -110,7 +111,7 @@ public:
template<typename SparseMatrixDerived> template<typename SparseMatrixDerived>
Derived& compute(const SparseMatrixBase<SparseMatrixDerived>& A) Derived& compute(const SparseMatrixBase<SparseMatrixDerived>& A)
{ {
grab(A); grab(A.derived());
m_preconditioner.compute(mp_matrix); m_preconditioner.compute(mp_matrix);
m_isInitialized = true; m_isInitialized = true;
m_analysisIsOk = true; m_analysisIsOk = true;
@ -229,6 +230,15 @@ protected:
::new (&mp_matrix) Ref<const MatrixType>(A); ::new (&mp_matrix) Ref<const MatrixType>(A);
} }
void grab(const Ref<const MatrixType> &A)
{
if(&(A.derived()) != &mp_matrix)
{
mp_matrix.~Ref<const MatrixType>();
::new (&mp_matrix) Ref<const MatrixType>(A);
}
}
MatrixType m_dummy; MatrixType m_dummy;
Ref<const MatrixType> mp_matrix; Ref<const MatrixType> mp_matrix;
Preconditioner m_preconditioner; Preconditioner m_preconditioner;

9
test/sparse_solver.h
View File

@ -83,6 +83,15 @@ void check_sparse_solving(Solver& solver, const typename Solver::MatrixType& A,
VERIFY(xm.isApprox(refX,test_precision<Scalar>())); VERIFY(xm.isApprox(refX,test_precision<Scalar>()));
} }
// test initialization ctor
{
Rhs x(b.rows(), b.cols());
Solver solver2(A);
VERIFY(solver2.info() == Success);
x = solver2.solve(b);
VERIFY(x.isApprox(refX,test_precision<Scalar>()));
}
// test dense Block as the result and rhs: // test dense Block as the result and rhs:
{ {
DenseRhs x(db.rows(), db.cols()); DenseRhs x(db.rows(), db.cols());