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

MatrixFunctions: Clean up StemFunction.h

Browse Source
This commit is contained in:
Jitse Niesen 2013-07-26 13:51:10 +01:00
parent 75edc7cc8b
commit e43934d60f
3 changed files with 96 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
View File

@ -547,7 +547,7 @@ const MatrixFunctionReturnValue<Derived> MatrixBase<Derived>::sin() const
{ {
eigen_assert(rows() == cols()); eigen_assert(rows() == cols());
typedef typename internal::stem_function<Scalar>::ComplexScalar ComplexScalar; typedef typename internal::stem_function<Scalar>::ComplexScalar ComplexScalar;
return MatrixFunctionReturnValue<Derived>(derived(), StdStemFunctions<ComplexScalar>::sin); return MatrixFunctionReturnValue<Derived>(derived(), internal::stem_function_sin<ComplexScalar>);
} }
template <typename Derived> template <typename Derived>
@ -555,7 +555,7 @@ const MatrixFunctionReturnValue<Derived> MatrixBase<Derived>::cos() const
{ {
eigen_assert(rows() == cols()); eigen_assert(rows() == cols());
typedef typename internal::stem_function<Scalar>::ComplexScalar ComplexScalar; typedef typename internal::stem_function<Scalar>::ComplexScalar ComplexScalar;
return MatrixFunctionReturnValue<Derived>(derived(), StdStemFunctions<ComplexScalar>::cos); return MatrixFunctionReturnValue<Derived>(derived(), internal::stem_function_cos<ComplexScalar>);
} }
template <typename Derived> template <typename Derived>
@ -563,7 +563,7 @@ const MatrixFunctionReturnValue<Derived> MatrixBase<Derived>::sinh() const
{ {
eigen_assert(rows() == cols()); eigen_assert(rows() == cols());
typedef typename internal::stem_function<Scalar>::ComplexScalar ComplexScalar; typedef typename internal::stem_function<Scalar>::ComplexScalar ComplexScalar;
return MatrixFunctionReturnValue<Derived>(derived(), StdStemFunctions<ComplexScalar>::sinh); return MatrixFunctionReturnValue<Derived>(derived(), internal::stem_function_sinh<ComplexScalar>);
} }
template <typename Derived> template <typename Derived>
@ -571,7 +571,7 @@ const MatrixFunctionReturnValue<Derived> MatrixBase<Derived>::cosh() const
{ {
eigen_assert(rows() == cols()); eigen_assert(rows() == cols());
typedef typename internal::stem_function<Scalar>::ComplexScalar ComplexScalar; typedef typename internal::stem_function<Scalar>::ComplexScalar ComplexScalar;
return MatrixFunctionReturnValue<Derived>(derived(), StdStemFunctions<ComplexScalar>::cosh); return MatrixFunctionReturnValue<Derived>(derived(), internal::stem_function_cosh<ComplexScalar>);
} }
} // end namespace Eigen } // end namespace Eigen

40
unsupported/Eigen/src/MatrixFunctions/StemFunction.h
View File

@ -12,24 +12,24 @@
namespace Eigen { namespace Eigen {
/** \ingroup MatrixFunctions_Module namespace internal {
* \brief Stem functions corresponding to standard mathematical functions.
*/
template <typename Scalar>
class StdStemFunctions : internal::noncopyable
{
public:
/** \brief The exponential function (and its derivatives). */ /** \brief The exponential function (and its derivatives). */
static Scalar exp(Scalar x, int) template <typename Scalar>
Scalar stem_function_exp(Scalar x, int)
{ {
return std::exp(x); using std::exp;
return exp(x);
} }
/** \brief Cosine (and its derivatives). */ /** \brief Cosine (and its derivatives). */
static Scalar cos(Scalar x, int n) template <typename Scalar>
Scalar stem_function_cos(Scalar x, int n)
{ {
using std::cos;
using std::sin;
Scalar res; Scalar res;
switch (n % 4) { switch (n % 4) {
case 0: case 0:
res = std::cos(x); res = std::cos(x);
@ -48,9 +48,13 @@ class StdStemFunctions : internal::noncopyable
} }
/** \brief Sine (and its derivatives). */ /** \brief Sine (and its derivatives). */
static Scalar sin(Scalar x, int n) template <typename Scalar>
Scalar stem_function_sin(Scalar x, int n)
{ {
using std::cos;
using std::sin;
Scalar res; Scalar res;
switch (n % 4) { switch (n % 4) {
case 0: case 0:
res = std::sin(x); res = std::sin(x);
@ -69,9 +73,13 @@ class StdStemFunctions : internal::noncopyable
} }
/** \brief Hyperbolic cosine (and its derivatives). */ /** \brief Hyperbolic cosine (and its derivatives). */
static Scalar cosh(Scalar x, int n) template <typename Scalar>
Scalar stem_function_cosh(Scalar x, int n)
{ {
using std::cosh;
using std::sinh;
Scalar res; Scalar res;
switch (n % 2) { switch (n % 2) {
case 0: case 0:
res = std::cosh(x); res = std::cosh(x);
@ -84,9 +92,13 @@ class StdStemFunctions : internal::noncopyable
} }
/** \brief Hyperbolic sine (and its derivatives). */ /** \brief Hyperbolic sine (and its derivatives). */
static Scalar sinh(Scalar x, int n) template <typename Scalar>
Scalar stem_function_sinh(Scalar x, int n)
{ {
using std::cosh;
using std::sinh;
Scalar res; Scalar res;
switch (n % 2) { switch (n % 2) {
case 0: case 0:
res = std::sinh(x); res = std::sinh(x);
@ -98,7 +110,7 @@ class StdStemFunctions : internal::noncopyable
return res; return res;
} }
}; // end of class StdStemFunctions } // end namespace internal
} // end namespace Eigen } // end namespace Eigen

2
unsupported/test/matrix_function.cpp
View File

@ -102,7 +102,7 @@ void testMatrixExponential(const MatrixType& A)
typedef typename NumTraits<Scalar>::Real RealScalar; typedef typename NumTraits<Scalar>::Real RealScalar;
typedef std::complex<RealScalar> ComplexScalar; typedef std::complex<RealScalar> ComplexScalar;
VERIFY_IS_APPROX(A.exp(), A.matrixFunction(StdStemFunctions<ComplexScalar>::exp)); VERIFY_IS_APPROX(A.exp(), A.matrixFunction(internal::stem_function_exp<ComplexScalar>));
} }
template<typename MatrixType> template<typename MatrixType>