diff options
author | Gael Guennebaud <g.gael@free.fr> | 2010-09-06 11:51:42 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2010-09-06 11:51:42 +0200 |
commit | 9bb75937cc698b32f2fe6ffac3b4e09a89c3c5f7 (patch) | |
tree | 99d99731ff24bf0599b69d869107821cf7cee55c | |
parent | 62eb4dc99bb79a0e2015548c248d6270928533f1 (diff) |
fix += return by value like operations
-rw-r--r-- | Eigen/src/Core/CwiseBinaryOp.h | 2 | ||||
-rw-r--r-- | Eigen/src/Core/NoAlias.h | 8 | ||||
-rw-r--r-- | Eigen/src/Core/SelfCwiseBinaryOp.h | 11 | ||||
-rw-r--r-- | test/cholesky.cpp | 15 | ||||
-rw-r--r-- | test/linearstructure.cpp | 2 |
5 files changed, 32 insertions, 6 deletions
diff --git a/Eigen/src/Core/CwiseBinaryOp.h b/Eigen/src/Core/CwiseBinaryOp.h index 171140c27..5def0db2a 100644 --- a/Eigen/src/Core/CwiseBinaryOp.h +++ b/Eigen/src/Core/CwiseBinaryOp.h @@ -216,7 +216,7 @@ EIGEN_STRONG_INLINE Derived & MatrixBase<Derived>::operator-=(const MatrixBase<OtherDerived> &other) { SelfCwiseBinaryOp<ei_scalar_difference_op<Scalar>, Derived, OtherDerived> tmp(derived()); - tmp = other; + tmp = other.derived(); return derived(); } diff --git a/Eigen/src/Core/NoAlias.h b/Eigen/src/Core/NoAlias.h index 03198879f..53ad3bfee 100644 --- a/Eigen/src/Core/NoAlias.h +++ b/Eigen/src/Core/NoAlias.h @@ -59,7 +59,9 @@ class NoAlias { typedef SelfCwiseBinaryOp<ei_scalar_sum_op<Scalar>, ExpressionType, OtherDerived> SelfAdder; SelfAdder tmp(m_expression); - ei_assign_selector<SelfAdder,OtherDerived,false>::run(tmp,other.derived()); + typedef typename ei_nested<OtherDerived>::type OtherDerivedNested; + typedef typename ei_cleantype<OtherDerivedNested>::type _OtherDerivedNested; + ei_assign_selector<SelfAdder,_OtherDerivedNested,false>::run(tmp,OtherDerivedNested(other.derived())); return m_expression; } @@ -69,7 +71,9 @@ class NoAlias { typedef SelfCwiseBinaryOp<ei_scalar_difference_op<Scalar>, ExpressionType, OtherDerived> SelfAdder; SelfAdder tmp(m_expression); - ei_assign_selector<SelfAdder,OtherDerived,false>::run(tmp,other.derived()); + typedef typename ei_nested<OtherDerived>::type OtherDerivedNested; + typedef typename ei_cleantype<OtherDerivedNested>::type _OtherDerivedNested; + ei_assign_selector<SelfAdder,_OtherDerivedNested,false>::run(tmp,OtherDerivedNested(other.derived())); return m_expression; } diff --git a/Eigen/src/Core/SelfCwiseBinaryOp.h b/Eigen/src/Core/SelfCwiseBinaryOp.h index 5100f6b25..f77589747 100644 --- a/Eigen/src/Core/SelfCwiseBinaryOp.h +++ b/Eigen/src/Core/SelfCwiseBinaryOp.h @@ -62,8 +62,6 @@ template<typename BinaryOp, typename Lhs, typename Rhs> class SelfCwiseBinaryOp typedef typename ei_packet_traits<Scalar>::type Packet; - using Base::operator=; - inline SelfCwiseBinaryOp(Lhs& xpr, const BinaryOp& func = BinaryOp()) : m_matrix(xpr), m_functor(func) {} inline Index rows() const { return m_matrix.rows(); } @@ -142,6 +140,15 @@ template<typename BinaryOp, typename Lhs, typename Rhs> class SelfCwiseBinaryOp #endif return *this; } + + // overloaded to honor evaluation of special matrices + // maybe another solution would be to not use SelfCwiseBinaryOp + // at first... + SelfCwiseBinaryOp& operator=(const Rhs& _rhs) + { + typename ei_nested<Rhs>::type rhs(_rhs); + return Base::operator=(rhs); + } protected: Lhs& m_matrix; diff --git a/test/cholesky.cpp b/test/cholesky.cpp index 0edf9a793..46140bb11 100644 --- a/test/cholesky.cpp +++ b/test/cholesky.cpp @@ -168,6 +168,21 @@ template<typename MatrixType> void cholesky(const MatrixType& m) } } + // test some special use cases of SelfCwiseBinaryOp: + MatrixType m1 = MatrixType::Random(rows,cols), m2(rows,cols); + m2 = m1; + m2 += symmLo.template selfadjointView<Lower>().llt().solve(matB); + VERIFY_IS_APPROX(m2, m1 + symmLo.template selfadjointView<Lower>().llt().solve(matB)); + m2 = m1; + m2 -= symmLo.template selfadjointView<Lower>().llt().solve(matB); + VERIFY_IS_APPROX(m2, m1 - symmLo.template selfadjointView<Lower>().llt().solve(matB)); + m2 = m1; + m2.noalias() += symmLo.template selfadjointView<Lower>().llt().solve(matB); + VERIFY_IS_APPROX(m2, m1 + symmLo.template selfadjointView<Lower>().llt().solve(matB)); + m2 = m1; + m2.noalias() -= symmLo.template selfadjointView<Lower>().llt().solve(matB); + VERIFY_IS_APPROX(m2, m1 - symmLo.template selfadjointView<Lower>().llt().solve(matB)); + } template<typename MatrixType> void cholesky_cplx(const MatrixType& m) diff --git a/test/linearstructure.cpp b/test/linearstructure.cpp index a0b8982dd..b5c58bdaa 100644 --- a/test/linearstructure.cpp +++ b/test/linearstructure.cpp @@ -27,7 +27,7 @@ template<typename MatrixType> void linearStructure(const MatrixType& m) { /* this test covers the following files: - Sum.h Difference.h Opposite.h ScalarMultiple.h + CwiseUnaryOp.h, CwiseBinaryOp.h, SelfCwiseBinaryOp.h */ typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; |