mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-08-12 11:49:02 +08:00
move cholesky to ei_xxx_return_value
This commit is contained in:
Benoit Jacob
parent
a77872dd6c
commit
0182695204
@ -30,6 +30,7 @@ namespace Eigen {
|
||||
* \endcode
|
||||
*/
|
||||
|
||||
#include "src/misc/Solve.h"
|
||||
#include "src/Array/CwiseOperators.h"
|
||||
#include "src/Array/Functors.h"
|
||||
#include "src/Cholesky/LLT.h"
|
||||
|
||||
@ -27,8 +27,6 @@
|
||||
#ifndef EIGEN_LDLT_H
|
||||
#define EIGEN_LDLT_H
|
||||
|
||||
template<typename MatrixType, typename Rhs> struct ei_ldlt_solve_impl;
|
||||
|
||||
/** \ingroup cholesky_Module
|
||||
*
|
||||
* \class LDLT
|
||||
@ -54,10 +52,10 @@ template<typename MatrixType, typename Rhs> struct ei_ldlt_solve_impl;
|
||||
* Note that during the decomposition, only the upper triangular part of A is considered. Therefore,
|
||||
* the strict lower part does not have to store correct values.
|
||||
*/
|
||||
template<typename MatrixType> class LDLT
|
||||
template<typename _MatrixType> class LDLT
|
||||
{
|
||||
public:
|
||||
|
||||
typedef _MatrixType MatrixType;
|
||||
typedef typename MatrixType::Scalar Scalar;
|
||||
typedef typename NumTraits<typename MatrixType::Scalar>::Real RealScalar;
|
||||
typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, 1> VectorType;
|
||||
@ -126,13 +124,13 @@ template<typename MatrixType> class LDLT
|
||||
* \sa solveInPlace(), MatrixBase::ldlt()
|
||||
*/
|
||||
template<typename Rhs>
|
||||
inline const ei_ldlt_solve_impl<MatrixType, Rhs>
|
||||
inline const ei_solve_return_value<LDLT, Rhs>
|
||||
solve(const MatrixBase<Rhs>& b) const
|
||||
{
|
||||
ei_assert(m_isInitialized && "LDLT is not initialized.");
|
||||
ei_assert(m_matrix.rows()==b.rows()
|
||||
&& "LDLT::solve(): invalid number of rows of the right hand side matrix b");
|
||||
return ei_ldlt_solve_impl<MatrixType, Rhs>(*this, b.derived());
|
||||
return ei_solve_return_value<LDLT, Rhs>(*this, b.derived());
|
||||
}
|
||||
|
||||
template<typename Derived>
|
||||
@ -150,6 +148,9 @@ template<typename MatrixType> class LDLT
|
||||
return m_matrix;
|
||||
}
|
||||
|
||||
inline int rows() const { return m_matrix.rows(); }
|
||||
inline int cols() const { return m_matrix.cols(); }
|
||||
|
||||
protected:
|
||||
/** \internal
|
||||
* Used to compute and store the Cholesky decomposition A = L D L^* = U^* D U.
|
||||
@ -263,36 +264,14 @@ LDLT<MatrixType>& LDLT<MatrixType>::compute(const MatrixType& a)
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<typename MatrixType,typename Rhs>
|
||||
struct ei_traits<ei_ldlt_solve_impl<MatrixType,Rhs> >
|
||||
template<typename MatrixType, typename Rhs, typename Dest>
|
||||
struct ei_solve_impl<LDLT<MatrixType>, Rhs, Dest>
|
||||
: ei_solve_return_value<LDLT<MatrixType>, Rhs>
|
||||
{
|
||||
typedef Matrix<typename Rhs::Scalar,
|
||||
MatrixType::ColsAtCompileTime,
|
||||
Rhs::ColsAtCompileTime,
|
||||
Rhs::PlainMatrixType::Options,
|
||||
MatrixType::MaxColsAtCompileTime,
|
||||
Rhs::MaxColsAtCompileTime> ReturnMatrixType;
|
||||
};
|
||||
|
||||
template<typename MatrixType, typename Rhs>
|
||||
struct ei_ldlt_solve_impl : public ReturnByValue<ei_ldlt_solve_impl<MatrixType, Rhs> >
|
||||
void evalTo(Dest& dst) const
|
||||
{
|
||||
typedef typename ei_cleantype<typename Rhs::Nested>::type RhsNested;
|
||||
typedef LDLT<MatrixType> LDLTType;
|
||||
const LDLTType& m_ldlt;
|
||||
const typename Rhs::Nested m_rhs;
|
||||
|
||||
ei_ldlt_solve_impl(const LDLTType& ldlt, const Rhs& rhs)
|
||||
: m_ldlt(ldlt), m_rhs(rhs)
|
||||
{}
|
||||
|
||||
inline int rows() const { return m_ldlt.matrixLDLT().cols(); }
|
||||
inline int cols() const { return m_rhs.cols(); }
|
||||
|
||||
template<typename Dest> void evalTo(Dest& dst) const
|
||||
{
|
||||
dst = m_rhs;
|
||||
m_ldlt.solveInPlace(dst);
|
||||
dst = this->m_rhs;
|
||||
this->m_dec.solveInPlace(dst);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
#define EIGEN_LLT_H
|
||||
|
||||
template<typename MatrixType, int UpLo> struct LLT_Traits;
|
||||
template<typename MatrixType, int UpLo, typename Rhs> struct ei_llt_solve_impl;
|
||||
|
||||
/** \ingroup cholesky_Module
|
||||
*
|
||||
@ -54,9 +53,10 @@ template<typename MatrixType, int UpLo, typename Rhs> struct ei_llt_solve_impl;
|
||||
* Note that during the decomposition, only the upper triangular part of A is considered. Therefore,
|
||||
* the strict lower part does not have to store correct values.
|
||||
*/
|
||||
template<typename MatrixType, int _UpLo> class LLT
|
||||
template<typename _MatrixType, int _UpLo> class LLT
|
||||
{
|
||||
private:
|
||||
public:
|
||||
typedef _MatrixType MatrixType;
|
||||
typedef typename MatrixType::Scalar Scalar;
|
||||
typedef typename NumTraits<typename MatrixType::Scalar>::Real RealScalar;
|
||||
typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, 1> VectorType;
|
||||
@ -69,8 +69,6 @@ template<typename MatrixType, int _UpLo> class LLT
|
||||
|
||||
typedef LLT_Traits<MatrixType,UpLo> Traits;
|
||||
|
||||
public:
|
||||
|
||||
/**
|
||||
* \brief Default Constructor.
|
||||
*
|
||||
@ -111,13 +109,13 @@ template<typename MatrixType, int _UpLo> class LLT
|
||||
* \sa solveInPlace(), MatrixBase::llt()
|
||||
*/
|
||||
template<typename Rhs>
|
||||
inline const ei_llt_solve_impl<MatrixType, UpLo, Rhs>
|
||||
inline const ei_solve_return_value<LLT, Rhs>
|
||||
solve(const MatrixBase<Rhs>& b) const
|
||||
{
|
||||
ei_assert(m_isInitialized && "LLT is not initialized.");
|
||||
ei_assert(m_matrix.rows()==b.rows()
|
||||
&& "LLT::solve(): invalid number of rows of the right hand side matrix b");
|
||||
return ei_llt_solve_impl<MatrixType, UpLo, Rhs>(*this, b.derived());
|
||||
return ei_solve_return_value<LLT, Rhs>(*this, b.derived());
|
||||
}
|
||||
|
||||
template<typename Derived>
|
||||
@ -135,6 +133,9 @@ template<typename MatrixType, int _UpLo> class LLT
|
||||
return m_matrix;
|
||||
}
|
||||
|
||||
inline int rows() const { return m_matrix.rows(); }
|
||||
inline int cols() const { return m_matrix.cols(); }
|
||||
|
||||
protected:
|
||||
/** \internal
|
||||
* Used to compute and store L
|
||||
@ -257,36 +258,14 @@ LLT<MatrixType,_UpLo>& LLT<MatrixType,_UpLo>::compute(const MatrixType& a)
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<typename MatrixType, int UpLo, typename Rhs>
|
||||
struct ei_traits<ei_llt_solve_impl<MatrixType,UpLo,Rhs> >
|
||||
template<typename MatrixType, int UpLo, typename Rhs, typename Dest>
|
||||
struct ei_solve_impl<LLT<MatrixType, UpLo>, Rhs, Dest>
|
||||
: ei_solve_return_value<LLT<MatrixType, UpLo>, Rhs>
|
||||
{
|
||||
typedef Matrix<typename Rhs::Scalar,
|
||||
MatrixType::ColsAtCompileTime,
|
||||
Rhs::ColsAtCompileTime,
|
||||
Rhs::PlainMatrixType::Options,
|
||||
MatrixType::MaxColsAtCompileTime,
|
||||
Rhs::MaxColsAtCompileTime> ReturnMatrixType;
|
||||
};
|
||||
|
||||
template<typename MatrixType, int UpLo, typename Rhs>
|
||||
struct ei_llt_solve_impl : public ReturnByValue<ei_llt_solve_impl<MatrixType,UpLo,Rhs> >
|
||||
void evalTo(Dest& dst) const
|
||||
{
|
||||
typedef typename ei_cleantype<typename Rhs::Nested>::type RhsNested;
|
||||
typedef LLT<MatrixType,UpLo> LLTType;
|
||||
const LLTType& m_llt;
|
||||
const typename Rhs::Nested m_rhs;
|
||||
|
||||
ei_llt_solve_impl(const LLTType& llt, const Rhs& rhs)
|
||||
: m_llt(llt), m_rhs(rhs)
|
||||
{}
|
||||
|
||||
inline int rows() const { return m_llt.matrixLLT().cols(); }
|
||||
inline int cols() const { return m_rhs.cols(); }
|
||||
|
||||
template<typename Dest> void evalTo(Dest& dst) const
|
||||
{
|
||||
dst = m_rhs;
|
||||
m_llt.solveInPlace(dst);
|
||||
dst = this->m_rhs;
|
||||
this->m_dec.solveInPlace(dst);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -22,7 +22,10 @@
|
||||
// License and a copy of the GNU General Public License along with
|
||||
// Eigen. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef EIGEN_NO_ASSERTION_CHECKING
|
||||
#define EIGEN_NO_ASSERTION_CHECKING
|
||||
#endif
|
||||
|
||||
#include "main.h"
|
||||
#include <Eigen/Cholesky>
|
||||
#include <Eigen/QR>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user