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

Make IncompleteLUT use SparseSolverBase.

Browse Source
This commit is contained in:
Gael Guennebaud 2014-09-01 17:19:16 +02:00
parent 863b7362bc
commit 8a74ce922c
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
View File

@ -94,8 +94,12 @@ Index QuickSplit(VectorV &row, VectorI &ind, Index ncut)
* http://comments.gmane.org/gmane.comp.lib.eigen/3302 * http://comments.gmane.org/gmane.comp.lib.eigen/3302
*/ */
template <typename _Scalar> template <typename _Scalar>
class IncompleteLUT : internal::noncopyable class IncompleteLUT : public SparseSolverBase<IncompleteLUT<_Scalar> >
{ {
protected:
typedef SparseSolverBase<IncompleteLUT<_Scalar> > Base;
using Base::m_isInitialized;
public:
typedef _Scalar Scalar; typedef _Scalar Scalar;
typedef typename NumTraits<Scalar>::Real RealScalar; typedef typename NumTraits<Scalar>::Real RealScalar;
typedef Matrix<Scalar,Dynamic,1> Vector; typedef Matrix<Scalar,Dynamic,1> Vector;
@ -108,13 +112,13 @@ class IncompleteLUT : internal::noncopyable
IncompleteLUT() IncompleteLUT()
: m_droptol(NumTraits<Scalar>::dummy_precision()), m_fillfactor(10), : m_droptol(NumTraits<Scalar>::dummy_precision()), m_fillfactor(10),
m_analysisIsOk(false), m_factorizationIsOk(false), m_isInitialized(false) m_analysisIsOk(false), m_factorizationIsOk(false)
{} {}
template<typename MatrixType> template<typename MatrixType>
IncompleteLUT(const MatrixType& mat, const RealScalar& droptol=NumTraits<Scalar>::dummy_precision(), int fillfactor = 10) IncompleteLUT(const MatrixType& mat, const RealScalar& droptol=NumTraits<Scalar>::dummy_precision(), int fillfactor = 10)
: m_droptol(droptol),m_fillfactor(fillfactor), : m_droptol(droptol),m_fillfactor(fillfactor),
m_analysisIsOk(false),m_factorizationIsOk(false),m_isInitialized(false) m_analysisIsOk(false),m_factorizationIsOk(false)
{ {
eigen_assert(fillfactor != 0); eigen_assert(fillfactor != 0);
compute(mat); compute(mat);
@ -159,11 +163,7 @@ class IncompleteLUT : internal::noncopyable
void setFillfactor(int fillfactor); void setFillfactor(int fillfactor);
template<typename Rhs, typename Dest> template<typename Rhs, typename Dest>
#ifndef EIGEN_TEST_EVALUATORS
void _solve(const Rhs& b, Dest& x) const
#else
void _solve_impl(const Rhs& b, Dest& x) const void _solve_impl(const Rhs& b, Dest& x) const
#endif
{ {
x = m_Pinv * b; x = m_Pinv * b;
x = m_lu.template triangularView<UnitLower>().solve(x); x = m_lu.template triangularView<UnitLower>().solve(x);
@ -180,15 +180,6 @@ class IncompleteLUT : internal::noncopyable
&& "IncompleteLUT::solve(): invalid number of rows of the right hand side matrix b"); && "IncompleteLUT::solve(): invalid number of rows of the right hand side matrix b");
return internal::solve_retval<IncompleteLUT, Rhs>(*this, b.derived()); return internal::solve_retval<IncompleteLUT, Rhs>(*this, b.derived());
} }
#else
template<typename Rhs> inline const Solve<IncompleteLUT, Rhs>
solve(const MatrixBase<Rhs>& b) const
{
eigen_assert(m_isInitialized && "IncompleteLUT is not initialized.");
eigen_assert(cols()==b.rows()
&& "IncompleteLUT::solve(): invalid number of rows of the right hand side matrix b");
return Solve<IncompleteLUT, Rhs>(*this, b.derived());
}
#endif #endif
protected: protected:
@ -208,7 +199,6 @@ protected:
int m_fillfactor; int m_fillfactor;
bool m_analysisIsOk; bool m_analysisIsOk;
bool m_factorizationIsOk; bool m_factorizationIsOk;
bool m_isInitialized;
ComputationInfo m_info; ComputationInfo m_info;
PermutationMatrix<Dynamic,Dynamic,Index> m_P; // Fill-reducing permutation PermutationMatrix<Dynamic,Dynamic,Index> m_P; // Fill-reducing permutation
PermutationMatrix<Dynamic,Dynamic,Index> m_Pinv; // Inverse permutation PermutationMatrix<Dynamic,Dynamic,Index> m_Pinv; // Inverse permutation
@ -473,7 +463,7 @@ struct solve_retval<IncompleteLUT<_MatrixType>, Rhs>
template<typename Dest> void evalTo(Dest& dst) const template<typename Dest> void evalTo(Dest& dst) const
{ {
dec()._solve(rhs(),dst); dec()._solve_impl(rhs(),dst);
} }
}; };