From 4aac87251f16094c01e9c5c8bbf094cd471a2306 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Tue, 22 Jul 2014 12:54:03 +0200
Subject: [PATCH] Re-enable a couple of unit tests with evaluators.

---
 Eigen/src/Core/SelfAdjointView.h    |  2 +-
 Eigen/src/SparseCore/SparseMatrix.h | 12 ++++++++++--
 test/CMakeLists.txt                 |  4 +++-
 test/main.h                         |  1 +
 test/sparse_basic.cpp               |  9 +++++----
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Eigen/src/Core/SelfAdjointView.h b/Eigen/src/Core/SelfAdjointView.h
index c8bdec5d4..546f61252 100644
--- a/Eigen/src/Core/SelfAdjointView.h
+++ b/Eigen/src/Core/SelfAdjointView.h
@@ -35,7 +35,7 @@ struct traits<SelfAdjointView<MatrixType, UpLo> > : traits<MatrixType>
   typedef typename nested<MatrixType>::type MatrixTypeNested;
   typedef typename remove_all<MatrixTypeNested>::type MatrixTypeNestedCleaned;
   typedef MatrixType ExpressionType;
-  typedef typename MatrixType::PlainObject DenseMatrixType;
+  typedef typename MatrixType::PlainObject FullMatrixType;
   enum {
     Mode = UpLo | SelfAdjoint,
     Flags =  MatrixTypeNestedCleaned::Flags & (HereditaryBits)
diff --git a/Eigen/src/SparseCore/SparseMatrix.h b/Eigen/src/SparseCore/SparseMatrix.h
index 5f0c3d0a7..6080c272a 100644
--- a/Eigen/src/SparseCore/SparseMatrix.h
+++ b/Eigen/src/SparseCore/SparseMatrix.h
@@ -52,7 +52,9 @@ struct traits<SparseMatrix<_Scalar, _Options, _Index> >
     MaxRowsAtCompileTime = Dynamic,
     MaxColsAtCompileTime = Dynamic,
     Flags = _Options | NestByRefBit | LvalueBit,
+#ifndef EIGEN_TEST_EVALUATORS
     CoeffReadCost = NumTraits<Scalar>::ReadCost,
+#endif
     SupportedAccessPatterns = InnerRandomAccessPattern
   };
 };
@@ -74,8 +76,10 @@ struct traits<Diagonal<const SparseMatrix<_Scalar, _Options, _Index>, DiagIndex>
     ColsAtCompileTime = 1,
     MaxRowsAtCompileTime = Dynamic,
     MaxColsAtCompileTime = 1,
-    Flags = 0,
-    CoeffReadCost = _MatrixTypeNested::CoeffReadCost*10
+    Flags = 0
+#ifndef EIGEN_TEST_EVALUATORS
+    , CoeffReadCost = _MatrixTypeNested::CoeffReadCost*10
+#endif
   };
 };
 
@@ -1343,6 +1347,8 @@ template<typename _Scalar, int _Options, typename _Index>
 struct evaluator<SparseMatrix<_Scalar,_Options,_Index> >
   : evaluator_base<SparseMatrix<_Scalar,_Options,_Index> >
 {
+  typedef _Scalar Scalar;
+  typedef _Index Index;
   typedef SparseMatrix<_Scalar,_Options,_Index> SparseMatrixType;
   typedef typename SparseMatrixType::InnerIterator InnerIterator;
   typedef typename SparseMatrixType::ReverseInnerIterator ReverseInnerIterator;
@@ -1358,6 +1364,8 @@ struct evaluator<SparseMatrix<_Scalar,_Options,_Index> >
   operator SparseMatrixType&() { return m_matrix->const_cast_derived(); }
   operator const SparseMatrixType&() const { return *m_matrix; }
   
+  Scalar coeff(Index row, Index col) const { return m_matrix->coeff(row,col); }
+
   const SparseMatrixType *m_matrix;
 };
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 154e62424..5b5b55c60 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -229,10 +229,12 @@ if(NOT EIGEN_TEST_EVALUATORS)
   ei_add_test(stdvector_overload)
   ei_add_test(stdlist)
   ei_add_test(stddeque)
-  ei_add_test(sparse_vector)
+endif(NOT EIGEN_TEST_EVALUATORS)
   ei_add_test(sparse_basic)
+  ei_add_test(sparse_vector)
   ei_add_test(sparse_product)
   ei_add_test(sparse_solvers)
+if(NOT EIGEN_TEST_EVALUATORS)
   ei_add_test(sparse_permutations)
   ei_add_test(simplicial_cholesky)
   ei_add_test(conjugate_gradient)
diff --git a/test/main.h b/test/main.h
index a3c157126..57996956d 100644
--- a/test/main.h
+++ b/test/main.h
@@ -72,6 +72,7 @@ namespace Eigen
 }
 
 #define TRACK std::cerr << __FILE__ << " " << __LINE__ << std::endl
+// #define TRACK while()
 
 #define EI_PP_MAKE_STRING2(S) #S
 #define EI_PP_MAKE_STRING(S) EI_PP_MAKE_STRING2(S)
diff --git a/test/sparse_basic.cpp b/test/sparse_basic.cpp
index 4c9b9111e..c86534bad 100644
--- a/test/sparse_basic.cpp
+++ b/test/sparse_basic.cpp
@@ -201,9 +201,9 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
     
     VERIFY(m3.innerVector(j0).nonZeros() == m3.transpose().innerVector(j0).nonZeros());
 
-    //m2.innerVector(j0) = 2*m2.innerVector(j1);
-    //refMat2.col(j0) = 2*refMat2.col(j1);
-    //VERIFY_IS_APPROX(m2, refMat2);
+//     m2.innerVector(j0) = 2*m2.innerVector(j1);
+//     refMat2.col(j0) = 2*refMat2.col(j1);
+//     VERIFY_IS_APPROX(m2, refMat2);
   }
 
   // test innerVectors()
@@ -239,7 +239,7 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
     
     VERIFY_IS_APPROX(m2, refMat2);
   }
-  
+
   // test basic computations
   {
     DenseMatrix refM1 = DenseMatrix::Zero(rows, rows);
@@ -255,6 +255,7 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
     initSparse<Scalar>(density, refM3, m3);
     initSparse<Scalar>(density, refM4, m4);
 
+    VERIFY_IS_APPROX(m1*s1, refM1*s1);
     VERIFY_IS_APPROX(m1+m2, refM1+refM2);
     VERIFY_IS_APPROX(m1+m2+m3, refM1+refM2+refM3);
     VERIFY_IS_APPROX(m3.cwiseProduct(m1+m2), refM3.cwiseProduct(refM1+refM2));