implicit conversion to scalar for inner product

3 files changed, 14 insertions, 9 deletions

diff --git a/test/array.cpp b/test/array.cpp
index df1e1b49e..b1fa45b12 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -129,7 +129,7 @@ template<typename ArrayType> void comparisons(const ArrayType& m)
   VERIFY(((m1.abs()+1)>RealScalar(0.1)).count() == rows*cols);
 
   typedef Array<typename ArrayType::Index, Dynamic, 1> ArrayOfIndices;
-  
+
   // TODO allows colwise/rowwise for array
   VERIFY_IS_APPROX(((m1.abs()+1)>RealScalar(0.1)).colwise().count(), ArrayOfIndices::Constant(cols,rows).transpose());
   VERIFY_IS_APPROX(((m1.abs()+1)>RealScalar(0.1)).rowwise().count(), ArrayOfIndices::Constant(rows, cols));
@@ -151,10 +151,10 @@ template<typename ArrayType> void array_real(const ArrayType& m)
   VERIFY_IS_APPROX(m1.sin(), ei_sin(m1));
   VERIFY_IS_APPROX(m1.cos(), std::cos(m1));
   VERIFY_IS_APPROX(m1.cos(), ei_cos(m1));
-  
+
   VERIFY_IS_APPROX(ei_cos(m1+RealScalar(3)*m2), ei_cos((m1+RealScalar(3)*m2).eval()));
   VERIFY_IS_APPROX(std::cos(m1+RealScalar(3)*m2), std::cos((m1+RealScalar(3)*m2).eval()));
-  
+
   VERIFY_IS_APPROX(m1.abs().sqrt(), std::sqrt(std::abs(m1)));
   VERIFY_IS_APPROX(m1.abs().sqrt(), ei_sqrt(ei_abs(m1)));
   VERIFY_IS_APPROX(m1.abs(), ei_sqrt(ei_abs2(m1)));
@@ -163,10 +163,10 @@ template<typename ArrayType> void array_real(const ArrayType& m)
   VERIFY_IS_APPROX(ei_abs2(std::real(m1)) + ei_abs2(std::imag(m1)), ei_abs2(m1));
   if(!NumTraits<Scalar>::IsComplex)
     VERIFY_IS_APPROX(ei_real(m1), m1);
-  
+
   VERIFY_IS_APPROX(m1.abs().log(), std::log(std::abs(m1)));
   VERIFY_IS_APPROX(m1.abs().log(), ei_log(ei_abs(m1)));
-  
+
   VERIFY_IS_APPROX(m1.exp(), std::exp(m1));
   VERIFY_IS_APPROX(m1.exp() * m2.exp(), std::exp(m1+m2));
   VERIFY_IS_APPROX(m1.exp(), ei_exp(m1));
diff --git a/test/array_for_matrix.cpp b/test/array_for_matrix.cpp
index 477d1788d..5d0b9bbbd 100644
--- a/test/array_for_matrix.cpp
+++ b/test/array_for_matrix.cpp
@@ -37,10 +37,10 @@ template<typename MatrixType> void array_for_matrix(const MatrixType& m)
   MatrixType m1 = MatrixType::Random(rows, cols),
              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>();
 
diff --git a/test/product.h b/test/product.h
index 277b73c45..71dc4bde2 100644
--- a/test/product.h
+++ b/test/product.h
@@ -71,8 +71,9 @@ template<typename MatrixType> void product(const MatrixType& m)
 
   Scalar s1 = ei_random<Scalar>();
 
-  int r = ei_random<int>(0, rows-1),
-      c = ei_random<int>(0, cols-1);
+  int r  = ei_random<int>(0, rows-1),
+      c  = ei_random<int>(0, cols-1),
+      c2 = ei_random<int>(0, cols-1);
 
   // begin testing Product.h: only associativity for now
   // (we use Transpose.h but this doesn't count as a test for it)
@@ -150,4 +151,8 @@ template<typename MatrixType> void product(const MatrixType& m)
   {
     VERIFY(areNotApprox(res2,square2 + m2.transpose() * m1));
   }
+
+  // inner product
+  Scalar x = square2.row(c) * square2.col(c2);
+  VERIFY_IS_APPROX(x, square2.row(c).transpose().cwiseProduct(square2.col(c2)).sum());
 }