diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-09-03 17:56:06 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-09-03 17:56:06 +0000 |
| commit | e14aa8c8aa1646bbfdf501a84b0665bb17220229 (patch) | |
| tree | 6e45f62be82a402bee82c25c28b8f26c1edd4394 /test | |
| parent | 59dc1da5bf6b5c57205ee8d695e0f6e852ca74ae (diff) | |
Add coeff-wise comparisons to scalar operators. You can now write:
mat.cwise() < 2
instead of:
mat.cwise() < MatrixType::Constant(mat.rows(), mat.cols(), 2)
Diffstat (limited to 'test')
| -rw-r--r-- | test/array.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/array.cpp b/test/array.cpp index 0fa13b65b..977449365 100644 --- a/test/array.cpp +++ b/test/array.cpp @@ -89,6 +89,12 @@ template<typename MatrixType> void comparisons(const MatrixType& m) VERIFY(! (m1.cwise() > m3).all() ); } + // comparisons to scalar + VERIFY( (m1.cwise() != (m1(r,c)+1) ).any() ); + VERIFY( (m1.cwise() > (m1(r,c)-1) ).any() ); + VERIFY( (m1.cwise() < (m1(r,c)+1) ).any() ); + VERIFY( (m1.cwise() == m1(r,c) ).any() ); + // test Select VERIFY_IS_APPROX( (m1.cwise()<m2).select(m1,m2), m1.cwise().min(m2) ); VERIFY_IS_APPROX( (m1.cwise()>m2).select(m1,m2), m1.cwise().max(m2) ); @@ -98,10 +104,13 @@ template<typename MatrixType> void comparisons(const MatrixType& m) m3(i,j) = ei_abs(m1(i,j))<mid ? 0 : m1(i,j); VERIFY_IS_APPROX( (m1.cwise().abs().cwise()<MatrixType::Constant(rows,cols,mid)) .select(MatrixType::Zero(rows,cols),m1), m3); + // shorter versions: VERIFY_IS_APPROX( (m1.cwise().abs().cwise()<MatrixType::Constant(rows,cols,mid)) .select(0,m1), m3); VERIFY_IS_APPROX( (m1.cwise().abs().cwise()>=MatrixType::Constant(rows,cols,mid)) .select(m1,0), m3); + // even shorter version: + VERIFY_IS_APPROX( (m1.cwise().abs().cwise()<mid).select(0,m1), m3); } void test_array() |