commit 627595ad191ffbb2bdab0466d15b951fdce55273
author Gael Guennebaud <g.gael@free.fr> Wed Jun 10 11:20:30 2009 +0200
committer Gael Guennebaud <g.gael@free.fr> Wed Jun 10 11:20:30 2009 +0200
tree 3947f010b19bcceaf87c71ae31d347783ba126b5
parent f3fd7fd22b74b7f54264e6ef46abb2de7550cd00

* rename PartialRedux to VectorwiseOp
* add VectorwiseOp's +, -, +=, -= operators

test/array.cpp

diff --git a/test/array.cpp b/test/array.cpp
index 053f973..37deeaa 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -33,7 +33,8 @@
 
   typedef typename MatrixType::Scalar Scalar;
   typedef typename NumTraits<Scalar>::Real RealScalar;
-  typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType;
+  typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> ColVectorType;
+  typedef Matrix<Scalar, 1, MatrixType::ColsAtCompileTime> RowVectorType;
 
   int rows = m.rows();
   int cols = m.cols();
@@ -42,6 +43,9 @@
              m2 = MatrixType::Random(rows, cols),
              m3(rows, cols);
 
+  ColVectorType cv1 = ColVectorType::Random(rows);
+  RowVectorType rv1 = RowVectorType::Random(cols);
+
   Scalar  s1 = ei_random<Scalar>(),
           s2 = ei_random<Scalar>();
 
@@ -62,6 +66,16 @@
   if (!ei_isApprox(m1.sum(), (m1+m2).sum()))
     VERIFY_IS_NOT_APPROX(((m1+m2).rowwise().sum()).sum(), m1.sum());
   VERIFY_IS_APPROX(m1.colwise().sum(), m1.colwise().redux(ei_scalar_sum_op<Scalar>()));
+
+  // vector-wise ops
+  m3 = m1;
+  VERIFY_IS_APPROX(m3.colwise() += cv1, m1.colwise() + cv1);
+  m3 = m1;
+  VERIFY_IS_APPROX(m3.colwise() -= cv1, m1.colwise() - cv1);
+  m3 = m1;
+  VERIFY_IS_APPROX(m3.rowwise() += rv1, m1.rowwise() + rv1);
+  m3 = m1;
+  VERIFY_IS_APPROX(m3.rowwise() -= rv1, m1.rowwise() - rv1);
 }
 
 template<typename MatrixType> void comparisons(const MatrixType& m)
@@ -89,13 +103,13 @@
     VERIFY(! (m1.cwise() < m3).all() );
     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) );
@@ -112,7 +126,7 @@
                         .select(m1,0), m3);
   // even shorter version:
   VERIFY_IS_APPROX( (m1.cwise().abs().cwise()<mid).select(0,m1), m3);
-  
+
   // count
   VERIFY(((m1.cwise().abs().cwise()+1).cwise()>RealScalar(0.1)).count() == rows*cols);
   VERIFY_IS_APPROX(((m1.cwise().abs().cwise()+1).cwise()>RealScalar(0.1)).colwise().count(), RowVectorXi::Constant(cols,rows));