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

Fix compilation of matrix log with Map as input

Browse Source
This commit is contained in:
Gael Guennebaud 2017-06-07 10:51:23 +02:00
parent f2a553fb7b
commit 26e8f9171e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,8 +398,8 @@ struct matrix_function_compute
template <typename MatrixType> template <typename MatrixType>
struct matrix_function_compute<MatrixType, 0> struct matrix_function_compute<MatrixType, 0>
{ {
template <typename AtomicType, typename ResultType> template <typename MatA, typename AtomicType, typename ResultType>
static void run(const MatrixType& A, AtomicType& atomic, ResultType &result) static void run(const MatA& A, AtomicType& atomic, ResultType &result)
{ {
typedef internal::traits<MatrixType> Traits; typedef internal::traits<MatrixType> Traits;
typedef typename Traits::Scalar Scalar; typedef typename Traits::Scalar Scalar;
@ -422,11 +422,10 @@ struct matrix_function_compute<MatrixType, 0>
template <typename MatrixType> template <typename MatrixType>
struct matrix_function_compute<MatrixType, 1> struct matrix_function_compute<MatrixType, 1>
{ {
template <typename AtomicType, typename ResultType> template <typename MatA, typename AtomicType, typename ResultType>
static void run(const MatrixType& A, AtomicType& atomic, ResultType &result) static void run(const MatA& A, AtomicType& atomic, ResultType &result)
{ {
typedef internal::traits<MatrixType> Traits; typedef internal::traits<MatrixType> Traits;
typedef typename MatrixType::Index Index;
// compute Schur decomposition of A // compute Schur decomposition of A
const ComplexSchur<MatrixType> schurOfA(A); const ComplexSchur<MatrixType> schurOfA(A);
@ -514,7 +513,7 @@ template<typename Derived> class MatrixFunctionReturnValue
typedef internal::MatrixFunctionAtomic<DynMatrixType> AtomicType; typedef internal::MatrixFunctionAtomic<DynMatrixType> AtomicType;
AtomicType atomic(m_f); AtomicType atomic(m_f);
internal::matrix_function_compute<NestedEvalTypeClean>::run(m_A, atomic, result); internal::matrix_function_compute<typename NestedEvalTypeClean::PlainObject>::run(m_A, atomic, result);
} }
Index rows() const { return m_A.rows(); } Index rows() const { return m_A.rows(); }

2
unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h
View File

@ -339,7 +339,7 @@ public:
typedef internal::MatrixLogarithmAtomic<DynMatrixType> AtomicType; typedef internal::MatrixLogarithmAtomic<DynMatrixType> AtomicType;
AtomicType atomic; AtomicType atomic;
internal::matrix_function_compute<DerivedEvalTypeClean>::run(m_A, atomic, result); internal::matrix_function_compute<typename DerivedEvalTypeClean::PlainObject>::run(m_A, atomic, result);
} }
Index rows() const { return m_A.rows(); } Index rows() const { return m_A.rows(); }