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

Simplify class hierarchy.

Browse Source
This commit is contained in:
Chen-Pang He 2013-07-04 05:10:43 +08:00
parent eaf92ef48c
commit 3cda1deb52
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
unsupported/Eigen/src/MatrixFunctions/MatrixPower.h
View File

@ -12,14 +12,16 @@
namespace Eigen { namespace Eigen {
template<typename MatrixPowerType> template<typename MatrixType> class MatrixPower;
class MatrixPowerRetval : public ReturnByValue< MatrixPowerRetval<MatrixPowerType> >
template<typename MatrixType>
class MatrixPowerRetval : public ReturnByValue< MatrixPowerRetval<MatrixType> >
{ {
public: public:
typedef typename MatrixPowerType::PlainObject::RealScalar RealScalar; typedef typename MatrixType::RealScalar RealScalar;
typedef typename MatrixPowerType::PlainObject::Index Index; typedef typename MatrixType::Index Index;
MatrixPowerRetval(MatrixPowerType& pow, RealScalar p) : m_pow(pow), m_p(p) MatrixPowerRetval(MatrixPower<MatrixType>& pow, RealScalar p) : m_pow(pow), m_p(p)
{ } { }
template<typename ResultType> template<typename ResultType>
@ -30,7 +32,7 @@ class MatrixPowerRetval : public ReturnByValue< MatrixPowerRetval<MatrixPowerTyp
Index cols() const { return m_pow.cols(); } Index cols() const { return m_pow.cols(); }
private: private:
MatrixPowerType& m_pow; MatrixPower<MatrixType>& m_pow;
const RealScalar m_p; const RealScalar m_p;
MatrixPowerRetval& operator=(const MatrixPowerRetval&); MatrixPowerRetval& operator=(const MatrixPowerRetval&);
}; };
@ -47,7 +49,7 @@ class MatrixPowerAtomic
typedef typename MatrixType::RealScalar RealScalar; typedef typename MatrixType::RealScalar RealScalar;
typedef std::complex<RealScalar> ComplexScalar; typedef std::complex<RealScalar> ComplexScalar;
typedef typename MatrixType::Index Index; typedef typename MatrixType::Index Index;
typedef Array< Scalar, RowsAtCompileTime, 1, ColMajor, MaxRowsAtCompileTime > ArrayType; typedef Array<Scalar, RowsAtCompileTime, 1, ColMajor, MaxRowsAtCompileTime> ArrayType;
const MatrixType& m_A; const MatrixType& m_A;
RealScalar m_p; RealScalar m_p;
@ -276,7 +278,6 @@ class MatrixPower
enum { enum {
RowsAtCompileTime = MatrixType::RowsAtCompileTime, RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime, ColsAtCompileTime = MatrixType::ColsAtCompileTime,
Options = MatrixType::Options,
MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime, MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime,
MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime
}; };
@ -285,8 +286,6 @@ class MatrixPower
typedef typename MatrixType::Index Index; typedef typename MatrixType::Index Index;
public: public:
typedef MatrixType PlainObject;
/** /**
* \brief Constructor. * \brief Constructor.
* *
@ -305,8 +304,8 @@ class MatrixPower
* \return The expression \f$ A^p \f$, where A is specified in the * \return The expression \f$ A^p \f$, where A is specified in the
* constructor. * constructor.
*/ */
const MatrixPowerRetval<MatrixPower> operator()(RealScalar p) const MatrixPowerRetval<MatrixType> operator()(RealScalar p)
{ return MatrixPowerRetval<MatrixPower>(*this, p); } { return MatrixPowerRetval<MatrixType>(*this, p); }
/** /**
* \brief Compute the matrix power. * \brief Compute the matrix power.
@ -315,15 +314,16 @@ class MatrixPower
* \param[out] res \f$ A^p \f$ where A is specified in the * \param[out] res \f$ A^p \f$ where A is specified in the
* constructor. * constructor.
*/ */
void compute(MatrixType& res, RealScalar p); template<typename ResultType>
void compute(ResultType& res, RealScalar p);
Index rows() const { return m_A.rows(); } Index rows() const { return m_A.rows(); }
Index cols() const { return m_A.cols(); } Index cols() const { return m_A.cols(); }
private: private:
typedef std::complex<RealScalar> ComplexScalar; typedef std::complex<RealScalar> ComplexScalar;
typedef Matrix< ComplexScalar, RowsAtCompileTime, ColsAtCompileTime, Options, MaxRowsAtCompileTime, typedef Matrix<ComplexScalar, RowsAtCompileTime, ColsAtCompileTime, MatrixType::Options,
MaxColsAtCompileTime > ComplexMatrix; MaxRowsAtCompileTime, MaxColsAtCompileTime> ComplexMatrix;
typename MatrixType::Nested m_A; typename MatrixType::Nested m_A;
MatrixType m_tmp; MatrixType m_tmp;
@ -338,21 +338,22 @@ class MatrixPower
template<typename ResultType> template<typename ResultType>
void computeFracPower(ResultType&, RealScalar); void computeFracPower(ResultType&, RealScalar);
template<int Rows, int Cols, int Opt, int MaxRows, int MaxCols> template<int Rows, int Cols, int Options, int MaxRows, int MaxCols>
static void revertSchur( static void revertSchur(
Matrix< ComplexScalar, Rows, Cols, Opt, MaxRows, MaxCols >& res, Matrix<ComplexScalar, Rows, Cols, Options, MaxRows, MaxCols>& res,
const ComplexMatrix& T, const ComplexMatrix& T,
const ComplexMatrix& U); const ComplexMatrix& U);
template<int Rows, int Cols, int Opt, int MaxRows, int MaxCols> template<int Rows, int Cols, int Options, int MaxRows, int MaxCols>
static void revertSchur( static void revertSchur(
Matrix< RealScalar, Rows, Cols, Opt, MaxRows, MaxCols >& res, Matrix<RealScalar, Rows, Cols, Options, MaxRows, MaxCols>& res,
const ComplexMatrix& T, const ComplexMatrix& T,
const ComplexMatrix& U); const ComplexMatrix& U);
}; };
template<typename MatrixType> template<typename MatrixType>
void MatrixPower<MatrixType>::compute(MatrixType& res, RealScalar p) template<typename ResultType>
void MatrixPower<MatrixType>::compute(ResultType& res, RealScalar p)
{ {
switch (cols()) { switch (cols()) {
case 0: case 0:
@ -371,7 +372,7 @@ template<typename MatrixType>
typename MatrixPower<MatrixType>::RealScalar typename MatrixPower<MatrixType>::RealScalar
MatrixPower<MatrixType>::modfAndInit(RealScalar x, RealScalar* intpart) MatrixPower<MatrixType>::modfAndInit(RealScalar x, RealScalar* intpart)
{ {
typedef Array< RealScalar, RowsAtCompileTime, 1, ColMajor, MaxRowsAtCompileTime > RealArray; typedef Array<RealScalar, RowsAtCompileTime, 1, ColMajor, MaxRowsAtCompileTime> RealArray;
*intpart = std::floor(x); *intpart = std::floor(x);
RealScalar res = x - *intpart; RealScalar res = x - *intpart;
@ -423,17 +424,17 @@ void MatrixPower<MatrixType>::computeFracPower(ResultType& res, RealScalar p)
} }
template<typename MatrixType> template<typename MatrixType>
template<int Rows, int Cols, int Opt, int MaxRows, int MaxCols> template<int Rows, int Cols, int Options, int MaxRows, int MaxCols>
inline void MatrixPower<MatrixType>::revertSchur( inline void MatrixPower<MatrixType>::revertSchur(
Matrix< ComplexScalar, Rows, Cols, Opt, MaxRows, MaxCols >& res, Matrix<ComplexScalar, Rows, Cols, Options, MaxRows, MaxCols>& res,
const ComplexMatrix& T, const ComplexMatrix& T,
const ComplexMatrix& U) const ComplexMatrix& U)
{ res.noalias() = U * (T.template triangularView<Upper>() * U.adjoint()); } { res.noalias() = U * (T.template triangularView<Upper>() * U.adjoint()); }
template<typename MatrixType> template<typename MatrixType>
template<int Rows, int Cols, int Opt, int MaxRows, int MaxCols> template<int Rows, int Cols, int Options, int MaxRows, int MaxCols>
inline void MatrixPower<MatrixType>::revertSchur( inline void MatrixPower<MatrixType>::revertSchur(
Matrix< RealScalar, Rows, Cols, Opt, MaxRows, MaxCols >& res, Matrix<RealScalar, Rows, Cols, Options, MaxRows, MaxCols>& res,
const ComplexMatrix& T, const ComplexMatrix& T,
const ComplexMatrix& U) const ComplexMatrix& U)
{ res.noalias() = (U * (T.template triangularView<Upper>() * U.adjoint())).real(); } { res.noalias() = (U * (T.template triangularView<Upper>() * U.adjoint())).real(); }