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

Clean-up usage of ExpressionTraits in all/any implementation.

Browse Source
This commit is contained in:
Gael Guennebaud 2016-12-20 14:38:05 +01:00
parent 10c6bcdc2e
commit 316673bbde
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Eigen/src/Core/BooleanRedux.h
View File

@ -14,56 +14,54 @@ namespace Eigen {
namespace internal { namespace internal {
template<typename Derived, int UnrollCount> template<typename Derived, int UnrollCount, int Rows>
struct all_unroller struct all_unroller
{ {
typedef typename Derived::ExpressionTraits Traits;
enum { enum {
col = (UnrollCount-1) / Traits::RowsAtCompileTime, col = (UnrollCount-1) / Rows,
row = (UnrollCount-1) % Traits::RowsAtCompileTime row = (UnrollCount-1) % Rows
}; };
static inline bool run(const Derived &mat) static inline bool run(const Derived &mat)
{ {
return all_unroller<Derived, UnrollCount-1>::run(mat) && mat.coeff(row, col); return all_unroller<Derived, UnrollCount-1, Rows>::run(mat) && mat.coeff(row, col);
} }
}; };
template<typename Derived> template<typename Derived, int Rows>
struct all_unroller<Derived, 0> struct all_unroller<Derived, 0, Rows>
{ {
static inline bool run(const Derived &/*mat*/) { return true; } static inline bool run(const Derived &/*mat*/) { return true; }
}; };
template<typename Derived> template<typename Derived, int Rows>
struct all_unroller<Derived, Dynamic> struct all_unroller<Derived, Dynamic, Rows>
{ {
static inline bool run(const Derived &) { return false; } static inline bool run(const Derived &) { return false; }
}; };
template<typename Derived, int UnrollCount> template<typename Derived, int UnrollCount, int Rows>
struct any_unroller struct any_unroller
{ {
typedef typename Derived::ExpressionTraits Traits;
enum { enum {
col = (UnrollCount-1) / Traits::RowsAtCompileTime, col = (UnrollCount-1) / Rows,
row = (UnrollCount-1) % Traits::RowsAtCompileTime row = (UnrollCount-1) % Rows
}; };
static inline bool run(const Derived &mat) static inline bool run(const Derived &mat)
{ {
return any_unroller<Derived, UnrollCount-1>::run(mat) || mat.coeff(row, col); return any_unroller<Derived, UnrollCount-1, Rows>::run(mat) || mat.coeff(row, col);
} }
}; };
template<typename Derived> template<typename Derived, int Rows>
struct any_unroller<Derived, 0> struct any_unroller<Derived, 0, Rows>
{ {
static inline bool run(const Derived & /*mat*/) { return false; } static inline bool run(const Derived & /*mat*/) { return false; }
}; };
template<typename Derived> template<typename Derived, int Rows>
struct any_unroller<Derived, Dynamic> struct any_unroller<Derived, Dynamic, Rows>
{ {
static inline bool run(const Derived &) { return false; } static inline bool run(const Derived &) { return false; }
}; };
@ -87,7 +85,7 @@ inline bool DenseBase<Derived>::all() const
}; };
Evaluator evaluator(derived()); Evaluator evaluator(derived());
if(unroll) if(unroll)
return internal::all_unroller<Evaluator, unroll ? int(SizeAtCompileTime) : Dynamic>::run(evaluator); return internal::all_unroller<Evaluator, unroll ? int(SizeAtCompileTime) : Dynamic, internal::traits<Derived>::RowsAtCompileTime>::run(evaluator);
else else
{ {
for(Index j = 0; j < cols(); ++j) for(Index j = 0; j < cols(); ++j)
@ -111,7 +109,7 @@ inline bool DenseBase<Derived>::any() const
}; };
Evaluator evaluator(derived()); Evaluator evaluator(derived());
if(unroll) if(unroll)
return internal::any_unroller<Evaluator, unroll ? int(SizeAtCompileTime) : Dynamic>::run(evaluator); return internal::any_unroller<Evaluator, unroll ? int(SizeAtCompileTime) : Dynamic, internal::traits<Derived>::RowsAtCompileTime>::run(evaluator);
else else
{ {
for(Index j = 0; j < cols(); ++j) for(Index j = 0; j < cols(); ++j)