diff options
| -rw-r--r-- | Eigen/src/Core/DiagonalMatrix.h | 15 | ||||
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 10 | ||||
| -rw-r--r-- | Eigen/src/Core/TriangularMatrix.h | 30 | ||||
| -rw-r--r-- | Eigen/src/Eigen2Support/TriangularSolver.h | 4 |
4 files changed, 54 insertions, 5 deletions
diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h index 7b105b299..7118db4b8 100644 --- a/Eigen/src/Core/DiagonalMatrix.h +++ b/Eigen/src/Core/DiagonalMatrix.h @@ -76,6 +76,19 @@ class DiagonalBase : public EigenBase<Derived> { return diagonal().cwiseInverse(); } + + #ifdef EIGEN2_SUPPORT + template<typename OtherDerived> + bool isApprox(const DiagonalBase<OtherDerived>& other, typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision()) const + { + return diagonal().isApprox(other.diagonal(), precision); + } + template<typename OtherDerived> + bool isApprox(const MatrixBase<OtherDerived>& other, typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision()) const + { + return toDenseMatrix().isApprox(other, precision); + } + #endif }; template<typename Derived> @@ -256,7 +269,7 @@ class DiagonalWrapper * \sa class DiagonalWrapper, class DiagonalMatrix, diagonal(), isDiagonal() **/ template<typename Derived> -inline const DiagonalWrapper<Derived> +inline const DiagonalWrapper<const Derived> MatrixBase<Derived>::asDiagonal() const { return derived(); diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 783fdaa48..e18104b95 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -245,7 +245,13 @@ template<typename Derived> class MatrixBase #ifdef EIGEN2_SUPPORT template<unsigned int Mode> TriangularView<Derived, Mode> part(); template<unsigned int Mode> const TriangularView<Derived, Mode> part() const; - #endif + + // huuuge hack. make Eigen2's matrix.part<Diagonal>() work in eigen3. Problem: Diagonal is now a class template instead + // of an integer constant. Solution: overload the part() method template wrt template parameters list. + template<template<typename T, int n> class U> + const DiagonalWrapper<ConstDiagonalReturnType> part() const + { return diagonal().asDiagonal(); } + #endif // EIGEN2_SUPPORT template<unsigned int Mode> struct TriangularViewReturnType { typedef TriangularView<Derived, Mode> Type; }; template<unsigned int Mode> struct ConstTriangularViewReturnType { typedef const TriangularView<const Derived, Mode> Type; }; @@ -270,7 +276,7 @@ template<typename Derived> class MatrixBase static const BasisReturnType UnitZ(); static const BasisReturnType UnitW(); - const DiagonalWrapper<Derived> asDiagonal() const; + const DiagonalWrapper<const Derived> asDiagonal() const; Derived& setIdentity(); Derived& setIdentity(Index rows, Index cols); diff --git a/Eigen/src/Core/TriangularMatrix.h b/Eigen/src/Core/TriangularMatrix.h index af5092a7e..3b5f5986b 100644 --- a/Eigen/src/Core/TriangularMatrix.h +++ b/Eigen/src/Core/TriangularMatrix.h @@ -295,6 +295,36 @@ template<typename _MatrixType, unsigned int _Mode> class TriangularView <Mode,false,OtherDerived,OtherDerived::IsVectorAtCompileTime,MatrixType,false> (lhs.derived(),rhs.m_matrix); } + + #ifdef EIGEN2_SUPPORT + + template<typename OtherMatrixType> + struct eigen2_product_return_type + { + typedef typename TriangularView<MatrixType,Mode>::DenseMatrixType DenseMatrixType; + typedef typename TriangularView<OtherMatrixType,Mode>::DenseMatrixType OtherDenseMatrixType; + typedef typename ProductReturnType<DenseMatrixType, OtherDenseMatrixType>::Type ProdRetType; + typedef typename ProdRetType::PlainObject type; + }; + template<typename OtherMatrixType> + const typename eigen2_product_return_type<OtherMatrixType>::type + operator*(const TriangularView<OtherMatrixType, Mode>& rhs) const + { + return toDenseMatrix() * rhs.toDenseMatrix(); + } + + template<typename OtherMatrixType> + bool isApprox(const TriangularView<OtherMatrixType, Mode>& other, typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision()) const + { + return toDenseMatrix().isApprox(other.toDenseMatrix(), precision); + } + template<typename OtherDerived> + bool isApprox(const MatrixBase<OtherDerived>& other, typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision()) const + { + return toDenseMatrix().isApprox(other, precision); + } + + #endif // EIGEN2_SUPPORT template<int Side, typename OtherDerived> typename internal::plain_matrix_type_column_major<OtherDerived>::type diff --git a/Eigen/src/Eigen2Support/TriangularSolver.h b/Eigen/src/Eigen2Support/TriangularSolver.h index a83640e62..e94e47a50 100644 --- a/Eigen/src/Eigen2Support/TriangularSolver.h +++ b/Eigen/src/Eigen2Support/TriangularSolver.h @@ -40,14 +40,14 @@ template<typename OtherDerived> typename ExpressionType::PlainObject Flagged<ExpressionType,Added,Removed>::solveTriangular(const MatrixBase<OtherDerived>& other) const { - return m_matrix.template triangularView<Added>.solve(other.derived()); + return m_matrix.template triangularView<Added>().solve(other.derived()); } template<typename ExpressionType, unsigned int Added, unsigned int Removed> template<typename OtherDerived> void Flagged<ExpressionType,Added,Removed>::solveTriangularInPlace(const MatrixBase<OtherDerived>& other) const { - m_matrix.template triangularView<Added>.solveInPlace(other.derived()); + m_matrix.template triangularView<Added>().solveInPlace(other.derived()); } #endif // EIGEN_TRIANGULAR_SOLVER2_H |