commit 71a171c267df54118cda01d845d42f3d3d465de3
author Gael Guennebaud <g.gael@free.fr> Mon Jan 04 19:13:08 2010 +0100
committer Gael Guennebaud <g.gael@free.fr> Mon Jan 04 19:13:08 2010 +0100
tree 9432398656cee78e36fde1841cf7453af18dae2f
parent b6898996d4107b5823fc0fdaa22bfe0811716863

s/asMatrix()/matrix()

test/array.cpp

diff --git a/test/array.cpp b/test/array.cpp
index 0284d55..0d54cf9 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -51,14 +51,14 @@
 
   // scalar addition
   VERIFY_IS_APPROX(m1.array() + s1, s1 + m1.array());
-  VERIFY_IS_APPROX((m1.array() + s1).asMatrix(), MatrixType::Constant(rows,cols,s1) + m1);
-  VERIFY_IS_APPROX(((m1*Scalar(2)).array() - s2).asMatrix(), (m1+m1) - MatrixType::Constant(rows,cols,s2) );
+  VERIFY_IS_APPROX((m1.array() + s1).matrix(), MatrixType::Constant(rows,cols,s1) + m1);
+  VERIFY_IS_APPROX(((m1*Scalar(2)).array() - s2).matrix(), (m1+m1) - MatrixType::Constant(rows,cols,s2) );
   m3 = m1;
   m3.array() += s2;
-  VERIFY_IS_APPROX(m3, (m1.array() + s2).asMatrix());
+  VERIFY_IS_APPROX(m3, (m1.array() + s2).matrix());
   m3 = m1;
   m3.array() -= s1;
-  VERIFY_IS_APPROX(m3, (m1.array() - s1).asMatrix());
+  VERIFY_IS_APPROX(m3, (m1.array() - s1).matrix());
 
   // reductions
   VERIFY_IS_APPROX(m1.colwise().sum().sum(), m1.sum());
@@ -130,8 +130,8 @@
   // count
   VERIFY(((m1.array().abs()+1)>RealScalar(0.1)).count() == rows*cols);
   // TODO allows colwise/rowwise for array
-  VERIFY_IS_APPROX(((m1.array().abs()+1)>RealScalar(0.1)).asMatrix().colwise().count(), RowVectorXi::Constant(cols,rows));
-  VERIFY_IS_APPROX(((m1.array().abs()+1)>RealScalar(0.1)).asMatrix().rowwise().count(), VectorXi::Constant(rows, cols));
+  VERIFY_IS_APPROX(((m1.array().abs()+1)>RealScalar(0.1)).matrix().colwise().count(), RowVectorXi::Constant(cols,rows));
+  VERIFY_IS_APPROX(((m1.array().abs()+1)>RealScalar(0.1)).matrix().rowwise().count(), VectorXi::Constant(rows, cols));
 }
 
 template<typename VectorType> void lpNorm(const VectorType& v)