Adaptions from .lazy() towards .noalias().

Added missing casts.

3 files changed, 13 insertions, 13 deletions

diff --git a/test/bandmatrix.cpp b/test/bandmatrix.cpp
index f677e7b85..2bdc67e28 100644
--- a/test/bandmatrix.cpp
+++ b/test/bandmatrix.cpp
@@ -44,21 +44,21 @@ template<typename MatrixType> void bandmatrix(const MatrixType& _m)
   dm1.diagonal().setConstant(123);
   for (int i=1; i<=m.supers();++i)
   {
-    m.diagonal(i).setConstant(i);
-    dm1.diagonal(i).setConstant(i);
+    m.diagonal(i).setConstant(static_cast<RealScalar>(i));
+    dm1.diagonal(i).setConstant(static_cast<RealScalar>(i));
   }
   for (int i=1; i<=m.subs();++i)
   {
-    m.diagonal(-i).setConstant(-i);
-    dm1.diagonal(-i).setConstant(-i);
+    m.diagonal(-i).setConstant(-static_cast<RealScalar>(i));
+    dm1.diagonal(-i).setConstant(-static_cast<RealScalar>(i));
   }
   //std::cerr << m.m_data << "\n\n" << m.toDense() << "\n\n" << dm1 << "\n\n\n\n";
   VERIFY_IS_APPROX(dm1,m.toDense());
 
   for (int i=0; i<cols; ++i)
   {
-    m.col(i).setConstant(i+1);
-    dm1.col(i).setConstant(i+1);
+    m.col(i).setConstant(static_cast<RealScalar>(i+1));
+    dm1.col(i).setConstant(static_cast<RealScalar>(i+1));
   }
   int d = std::min(rows,cols);
   int a = std::max(0,cols-d-supers);
diff --git a/test/product.h b/test/product.h
index 157f6262b..40773ad90 100644
--- a/test/product.h
+++ b/test/product.h
@@ -81,7 +81,7 @@ template<typename MatrixType> void product(const MatrixType& m)
   m3 = m1;
   m3 *= m1.transpose() * m2;
   VERIFY_IS_APPROX(m3,                      m1 * (m1.transpose()*m2));
-  VERIFY_IS_APPROX(m3,                      m1.lazy() * (m1.transpose()*m2));
+  VERIFY_IS_APPROX(m3,                      m1 * (m1.transpose()*m2));
 
   // continue testing Product.h: distributivity
   VERIFY_IS_APPROX(square*(m1 + m2),        square*m1+square*m2);
@@ -109,26 +109,26 @@ template<typename MatrixType> void product(const MatrixType& m)
 
   // test optimized operator+= path
   res = square;
-  res += (m1 * m2.transpose()).lazy();
+  res.noalias() += m1 * m2.transpose();
   VERIFY_IS_APPROX(res, square + m1 * m2.transpose());
   if (NumTraits<Scalar>::HasFloatingPoint && std::min(rows,cols)>1)
   {
     VERIFY(areNotApprox(res,square + m2 * m1.transpose()));
   }
   vcres = vc2;
-  vcres += (m1.transpose() * v1).lazy();
+  vcres.noalias() += m1.transpose() * v1;
   VERIFY_IS_APPROX(vcres, vc2 + m1.transpose() * v1);
 
   // test optimized operator-= path
   res = square;
-  res -= (m1 * m2.transpose()).lazy();
+  res.noalias() -= m1 * m2.transpose();
   VERIFY_IS_APPROX(res, square - (m1 * m2.transpose()));
   if (NumTraits<Scalar>::HasFloatingPoint && std::min(rows,cols)>1)
   {
     VERIFY(areNotApprox(res,square - m2 * m1.transpose()));
   }
   vcres = vc2;
-  vcres -= (m1.transpose() * v1).lazy();
+  vcres.noalias() -= m1.transpose() * v1;
   VERIFY_IS_APPROX(vcres, vc2 - m1.transpose() * v1);
 
   tm1 = m1;
@@ -145,7 +145,7 @@ template<typename MatrixType> void product(const MatrixType& m)
   VERIFY_IS_APPROX(res, m1 * m2.transpose());
 
   res2 = square2;
-  res2 += (m1.transpose() * m2).lazy();
+  res2.noalias() += m1.transpose() * m2;
   VERIFY_IS_APPROX(res2, square2 + m1.transpose() * m2);
   if (NumTraits<Scalar>::HasFloatingPoint && std::min(rows,cols)>1)
   {
diff --git a/test/product_symm.cpp b/test/product_symm.cpp
index 1300928a2..cf0299c64 100644
--- a/test/product_symm.cpp
+++ b/test/product_symm.cpp
@@ -96,7 +96,7 @@ template<typename Scalar, int Size, int OtherSize> void symm(int size = Size, in
 
 
   m2 = m1.template triangularView<UpperTriangular>(); rhs13 = rhs12;
-  VERIFY_IS_APPROX(rhs12 += (s1 * ((m2.adjoint()).template selfadjointView<LowerTriangular>() * (s2*rhs3).conjugate())).lazy(),
+  VERIFY_IS_APPROX(rhs12.noalias() += s1 * ((m2.adjoint()).template selfadjointView<LowerTriangular>() * (s2*rhs3).conjugate()),
                    rhs13 += (s1*m1.adjoint()) * (s2*rhs3).conjugate());
 
   // test matrix * selfadjoint