commit f5791eeb7054b78ded6eb080e9712651da6c6a34
author Benoit Jacob <jacob.benoit.1@gmail.com> Tue Jul 08 00:49:10 2008 +0000
committer Benoit Jacob <jacob.benoit.1@gmail.com> Tue Jul 08 00:49:10 2008 +0000
tree 414c138b050003fdc32e0cebcc6f39ea1e94dc7f
parent c910c517b34b147894e7fa62cb9602cc19e0669b

the big Array/Cwise rework as discussed on the mailing list. The new API
can be seen in Eigen/src/Core/Cwise.h.

test/array.cpp

diff --git a/test/array.cpp b/test/array.cpp
index d05c4f7..6233aae 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -44,15 +44,15 @@
   Scalar  s1 = ei_random<Scalar>(),
           s2 = ei_random<Scalar>();
 
-  VERIFY_IS_APPROX(m1.array() + s1, s1 + m1.array());
-  VERIFY_IS_APPROX(m1.array() + s1, MatrixType::constant(rows,cols,s1) + m1);
-  VERIFY_IS_APPROX((m1*Scalar(2)).array() - s2, (m1+m1) - MatrixType::constant(rows,cols,s2) );
+  VERIFY_IS_APPROX(m1.cwise() + s1, s1 + m1.cwise());
+  VERIFY_IS_APPROX(m1.cwise() + s1, MatrixType::constant(rows,cols,s1) + m1);
+  VERIFY_IS_APPROX((m1*Scalar(2)).cwise() - s2, (m1+m1) - MatrixType::constant(rows,cols,s2) );
   m3 = m1;
-  m3.array() += s2;
-  VERIFY_IS_APPROX(m3, m1.array() + s2);
+  m3.cwise() += s2;
+  VERIFY_IS_APPROX(m3, m1.cwise() + s2);
   m3 = m1;
-  m3.array() -= s1;
-  VERIFY_IS_APPROX(m3, m1.array() - s1);
+  m3.cwise() -= s1;
+  VERIFY_IS_APPROX(m3, m1.cwise() - s1);
 }
 
 template<typename MatrixType> void comparisons(const MatrixType& m)
@@ -70,14 +70,14 @@
              m2 = MatrixType::random(rows, cols),
              m3(rows, cols);
 
-  VERIFY((m1.array() + Scalar(1)).array() > m1.array());
-  VERIFY((m1.array() - Scalar(1)).array() < m1.array());
+  VERIFY(((m1.cwise() + Scalar(1)).cwise() > m1).all());
+  VERIFY(((m1.cwise() - Scalar(1)).cwise() < m1).all());
   if (rows*cols>1)
   {
     m3 = m1;
     m3(r,c) += 1;
-    VERIFY(! (m1.array() < m3.array()) );
-    VERIFY(! (m1.array() > m3.array()) );
+    VERIFY(! (m1.cwise() < m3).all() );
+    VERIFY(! (m1.cwise() > m3).all() );
   }
 }