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

bug #1359: fix sparse /=scalar and *=scalar implementation.

Browse Source 
InnerIterators must be obtained from an evaluator.
This commit is contained in:
Gael Guennebaud 2016-12-14 17:03:13 +01:00
parent c817ce3ba3
commit 98d7458275
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/SparseCore/SparseCwiseUnaryOp.h
View File

@ -123,8 +123,10 @@ template<typename Derived>
EIGEN_STRONG_INLINE Derived& EIGEN_STRONG_INLINE Derived&
SparseMatrixBase<Derived>::operator*=(const Scalar& other) SparseMatrixBase<Derived>::operator*=(const Scalar& other)
{ {
typedef typename internal::evaluator<Derived>::InnerIterator EvalIterator;
internal::evaluator<Derived> thisEval(derived());
for (Index j=0; j<outerSize(); ++j) for (Index j=0; j<outerSize(); ++j)
for (typename Derived::InnerIterator i(derived(),j); i; ++i) for (EvalIterator i(thisEval,j); i; ++i)
i.valueRef() *= other; i.valueRef() *= other;
return derived(); return derived();
} }
@ -133,8 +135,10 @@ template<typename Derived>
EIGEN_STRONG_INLINE Derived& EIGEN_STRONG_INLINE Derived&
SparseMatrixBase<Derived>::operator/=(const Scalar& other) SparseMatrixBase<Derived>::operator/=(const Scalar& other)
{ {
typedef typename internal::evaluator<Derived>::InnerIterator EvalIterator;
internal::evaluator<Derived> thisEval(derived());
for (Index j=0; j<outerSize(); ++j) for (Index j=0; j<outerSize(); ++j)
for (typename Derived::InnerIterator i(derived(),j); i; ++i) for (EvalIterator i(thisEval,j); i; ++i)
i.valueRef() /= other; i.valueRef() /= other;
return derived(); return derived();
} }