From bd506d837cf0ffa61352d72f4ca7a7c14bede9fa Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 13 Jul 2009 15:21:32 +0200 Subject: [PATCH] fix typo in previous commit --- Eigen/src/Sparse/SparseMatrixBase.h | 9 +-------- Eigen/src/Sparse/SparseNestByValue.h | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/Eigen/src/Sparse/SparseMatrixBase.h b/Eigen/src/Sparse/SparseMatrixBase.h index 6cf4d5e96..83e79788c 100644 --- a/Eigen/src/Sparse/SparseMatrixBase.h +++ b/Eigen/src/Sparse/SparseMatrixBase.h @@ -446,14 +446,7 @@ template class SparseMatrixBase { 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(); + res.coeffRef(i.row(),i.col()) = i.value(); } } return res; diff --git a/Eigen/src/Sparse/SparseNestByValue.h b/Eigen/src/Sparse/SparseNestByValue.h index 72fd056c4..b48277232 100644 --- a/Eigen/src/Sparse/SparseNestByValue.h +++ b/Eigen/src/Sparse/SparseNestByValue.h @@ -42,11 +42,11 @@ struct ei_traits > : public ei_traits class SparseNestByValue - : public SparseMatrixBase > + : public SparseMatrixBase > { public: - class InnerIterator; + typedef typename ExpressionType::InnerIterator InnerIterator; EIGEN_SPARSE_GENERIC_PUBLIC_INTERFACE(SparseNestByValue) @@ -70,15 +70,15 @@ SparseMatrixBase::nestByValue() const return SparseNestByValue(derived()); } -template -class SparseNestByValue::InnerIterator : public MatrixType::InnerIterator -{ - typedef typename MatrixType::InnerIterator Base; - public: - - EIGEN_STRONG_INLINE InnerIterator(const SparseNestByValue& expr, int outer) - : Base(expr.m_expression, outer) - {} -}; +// template +// class SparseNestByValue::InnerIterator : public MatrixType::InnerIterator +// { +// typedef typename MatrixType::InnerIterator Base; +// public: +// +// EIGEN_STRONG_INLINE InnerIterator(const SparseNestByValue& expr, int outer) +// : Base(expr.m_expression, outer) +// {} +// }; #endif // EIGEN_SPARSENESTBYVALUE_H