diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-03-10 23:24:40 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-03-10 23:24:40 +0100 |
| commit | da6ec812820259b7474bff49c8fc0443c88900e5 (patch) | |
| tree | bbe0b06e88926f0700626b342adc3303ebc868b0 /Eigen/src/Core/Select.h | |
| parent | 354bd8a42837ac405a142281fca2c4ac59ff701f (diff) | |
Move CoeffReadCost mechanism to evaluators
Diffstat (limited to 'Eigen/src/Core/Select.h')
| -rw-r--r-- | Eigen/src/Core/Select.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/src/Core/Select.h b/Eigen/src/Core/Select.h index 87993bbb5..abcba2d15 100644 --- a/Eigen/src/Core/Select.h +++ b/Eigen/src/Core/Select.h @@ -43,10 +43,13 @@ struct traits<Select<ConditionMatrixType, ThenMatrixType, ElseMatrixType> > ColsAtCompileTime = ConditionMatrixType::ColsAtCompileTime, MaxRowsAtCompileTime = ConditionMatrixType::MaxRowsAtCompileTime, MaxColsAtCompileTime = ConditionMatrixType::MaxColsAtCompileTime, - Flags = (unsigned int)ThenMatrixType::Flags & ElseMatrixType::Flags & HereditaryBits, + Flags = (unsigned int)ThenMatrixType::Flags & ElseMatrixType::Flags & HereditaryBits +#ifndef EIGEN_TEST_EVALUATORS + , CoeffReadCost = traits<typename remove_all<ConditionMatrixNested>::type>::CoeffReadCost + EIGEN_SIZE_MAX(traits<typename remove_all<ThenMatrixNested>::type>::CoeffReadCost, traits<typename remove_all<ElseMatrixNested>::type>::CoeffReadCost) +#endif }; }; } |