add a generic mechanism to copy a special matrix to a dense matrix so that

we don't need to add other specialization of MatrixBase::operator=, Matrix::=,
and Matrix::Matrix(...)

1 files changed, 10 insertions, 16 deletions

diff --git a/Eigen/src/Sparse/SparseMatrixBase.h b/Eigen/src/Sparse/SparseMatrixBase.h
index 8c53757b0..82527f7ef 100644
--- a/Eigen/src/Sparse/SparseMatrixBase.h
+++ b/Eigen/src/Sparse/SparseMatrixBase.h
@@ -451,25 +451,19 @@ template<typename Derived> class SparseMatrixBase
 //     Derived& setRandom();
 //     Derived& setIdentity();
 
-      Matrix<Scalar,RowsAtCompileTime,ColsAtCompileTime> toDense() const
+      template<typename DenseDerived>
+      void evalToDense(MatrixBase<DenseDerived>& dst)
       {
-        Matrix<Scalar,RowsAtCompileTime,ColsAtCompileTime> res(rows(),cols());
-        res.setZero();
+        dst.resize(rows(),cols());
+        dst.setZero();
         for (int j=0; j<outerSize(); ++j)
-        {
           for (typename Derived::InnerIterator i(derived(),j); i; ++i)
-          {
-            if(IsRowMajor)
-              std::cerr << i.row() << "," << i.col() << " == " << j << "," << i.index() << "\n";
-            else
-              std::cerr << i.row() << "," << i.col() << " == " << i.index() << "," << j << "\n";
-//             if(IsRowMajor)
-              res.coeffRef(i.row(),i.col()) = i.value();
-//             else
-//               res.coeffRef(i.index(),j) = i.value();
-          }
-        }
-        return res;
+            res.coeffRef(i.row(),i.col()) = i.value();
+      }
+
+      Matrix<Scalar,RowsAtCompileTime,ColsAtCompileTime> toDense() const
+      {
+        return derived();
       }
 
     template<typename OtherDerived>