devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix for a = a * b; when a has to be resized

Browse Source
This commit is contained in:
Gael Guennebaud
2009-07-20 10:35:47 +02:00
parent 32b08ac971
commit a551107cce
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Eigen/src/Core/Matrix.h
View File

@@ -536,6 +536,9 @@ class Matrix
resizeLike(other);
}
template<typename MatrixType, typename OtherDerived, bool EvalBeforeAssigning = (int(OtherDerived::Flags) & EvalBeforeAssigningBit) != 0>
struct ei_matrix_set_selector;
/** \internal Copies the value of the expression \a other into \c *this with automatic resizing.
*
* *this might be resized to match the dimensions of \a other. If *this was a null matrix (not already initialized),
@@ -550,8 +553,8 @@ class Matrix
template<typename OtherDerived>
EIGEN_STRONG_INLINE Matrix& _set(const MatrixBase<OtherDerived>& other)
{
_resize_to_match(other);
return Base::operator=(other);
ei_matrix_set_selector<Matrix,OtherDerived>::run(*this,other.derived());
return *this;
}
/** \internal Like _set() but additionally makes the assumption that no aliasing effect can happen (which
@@ -600,6 +603,20 @@ class Matrix
}
};
template<typename _Scalar, int _Rows, int _Cols, int _Options, int _MaxRows, int _MaxCols>
template<typename MatrixType, typename OtherDerived>
struct Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>::ei_matrix_set_selector<MatrixType,OtherDerived,true>
{
static void run(MatrixType& dst, const OtherDerived& src) { dst._set_noalias(src.eval()); }
};
template<typename _Scalar, int _Rows, int _Cols, int _Options, int _MaxRows, int _MaxCols>
template<typename MatrixType, typename OtherDerived>
struct Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>::ei_matrix_set_selector<MatrixType,OtherDerived,false>
{
static void run(MatrixType& dst, const OtherDerived& src) { dst._set_noalias(src); }
};
/** \defgroup matrixtypedefs Global matrix typedefs
*
* \ingroup Core_Module