diff options
author | Gael Guennebaud <g.gael@free.fr> | 2016-12-01 21:55:10 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2016-12-01 21:55:10 +0100 |
commit | 27873008d431a307bed9c200a12622a361af4d14 (patch) | |
tree | 0e28bbbad6320e31a61dda81676e895081141a7b | |
parent | 181138a1cb09e8eac68be36fd6139098466dc48c (diff) |
Clean up SparseCore module regarding ReverseInnerIterator
-rw-r--r-- | Eigen/src/SparseCore/SparseBlock.h | 3 | ||||
-rw-r--r-- | Eigen/src/SparseCore/SparseCompressedBase.h | 1 | ||||
-rw-r--r-- | Eigen/src/SparseCore/SparseCwiseBinaryOp.h | 6 | ||||
-rw-r--r-- | Eigen/src/SparseCore/SparseCwiseUnaryOp.h | 54 | ||||
-rw-r--r-- | Eigen/src/SparseCore/SparseTranspose.h | 12 |
5 files changed, 0 insertions, 76 deletions
diff --git a/Eigen/src/SparseCore/SparseBlock.h b/Eigen/src/SparseCore/SparseBlock.h index acaf933f4..cb8d9d2e2 100644 --- a/Eigen/src/SparseCore/SparseBlock.h +++ b/Eigen/src/SparseCore/SparseBlock.h @@ -432,7 +432,6 @@ public: protected:
// friend class internal::GenericSparseBlockInnerIteratorImpl<XprType,BlockRows,BlockCols,InnerPanel>;
- friend class ReverseInnerIterator;
friend struct internal::unary_evaluator<Block<XprType,BlockRows,BlockCols,InnerPanel>, internal::IteratorBased, Scalar >;
Index nonZeros() const { return Dynamic; }
@@ -468,8 +467,6 @@ struct unary_evaluator<Block<ArgType,BlockRows,BlockCols,InnerPanel>, IteratorBa typedef typename XprType::StorageIndex StorageIndex;
typedef typename XprType::Scalar Scalar;
- class ReverseInnerIterator;
-
enum {
IsRowMajor = XprType::IsRowMajor,
diff --git a/Eigen/src/SparseCore/SparseCompressedBase.h b/Eigen/src/SparseCore/SparseCompressedBase.h index 710eb0156..e0850795c 100644 --- a/Eigen/src/SparseCore/SparseCompressedBase.h +++ b/Eigen/src/SparseCore/SparseCompressedBase.h @@ -273,7 +273,6 @@ struct evaluator<SparseCompressedBase<Derived> > { typedef typename Derived::Scalar Scalar; typedef typename Derived::InnerIterator InnerIterator; - typedef typename Derived::ReverseInnerIterator ReverseInnerIterator; enum { CoeffReadCost = NumTraits<Scalar>::ReadCost, diff --git a/Eigen/src/SparseCore/SparseCwiseBinaryOp.h b/Eigen/src/SparseCore/SparseCwiseBinaryOp.h index 4ba4d631d..0a9bdeac2 100644 --- a/Eigen/src/SparseCore/SparseCwiseBinaryOp.h +++ b/Eigen/src/SparseCore/SparseCwiseBinaryOp.h @@ -68,7 +68,6 @@ protected: typedef typename XprType::StorageIndex StorageIndex; public: - class ReverseInnerIterator; class InnerIterator { public: @@ -161,7 +160,6 @@ protected: typedef typename XprType::StorageIndex StorageIndex; public: - class ReverseInnerIterator; class InnerIterator { enum { IsRowMajor = (int(Rhs::Flags)&RowMajorBit)==RowMajorBit }; @@ -249,7 +247,6 @@ protected: typedef typename XprType::StorageIndex StorageIndex; public: - class ReverseInnerIterator; class InnerIterator { enum { IsRowMajor = (int(Lhs::Flags)&RowMajorBit)==RowMajorBit }; @@ -402,7 +399,6 @@ protected: typedef typename traits<XprType>::Scalar Scalar; public: - class ReverseInnerIterator; class InnerIterator { public: @@ -487,7 +483,6 @@ protected: typedef typename traits<XprType>::Scalar Scalar; public: - class ReverseInnerIterator; class InnerIterator { enum { IsRowMajor = (int(RhsArg::Flags)&RowMajorBit)==RowMajorBit }; @@ -561,7 +556,6 @@ protected: typedef typename traits<XprType>::Scalar Scalar; public: - class ReverseInnerIterator; class InnerIterator { enum { IsRowMajor = (int(LhsArg::Flags)&RowMajorBit)==RowMajorBit }; diff --git a/Eigen/src/SparseCore/SparseCwiseUnaryOp.h b/Eigen/src/SparseCore/SparseCwiseUnaryOp.h index 9143a4c82..28f221437 100644 --- a/Eigen/src/SparseCore/SparseCwiseUnaryOp.h +++ b/Eigen/src/SparseCore/SparseCwiseUnaryOp.h @@ -22,7 +22,6 @@ struct unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased> typedef CwiseUnaryOp<UnaryOp, ArgType> XprType; class InnerIterator; - class ReverseInnerIterator; enum { CoeffReadCost = evaluator<ArgType>::CoeffReadCost + functor_traits<UnaryOp>::Cost, @@ -41,7 +40,6 @@ struct unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased> protected: typedef typename evaluator<ArgType>::InnerIterator EvalIterator; -// typedef typename evaluator<ArgType>::ReverseInnerIterator EvalReverseIterator; const UnaryOp m_functor; evaluator<ArgType> m_argImpl; @@ -70,33 +68,6 @@ class unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased>::InnerIterat Scalar& valueRef(); }; -// template<typename UnaryOp, typename ArgType> -// class unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased>::ReverseInnerIterator -// : public unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased>::EvalReverseIterator -// { -// typedef typename XprType::Scalar Scalar; -// typedef typename unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased>::EvalReverseIterator Base; -// public: -// -// EIGEN_STRONG_INLINE ReverseInnerIterator(const XprType& unaryOp, typename XprType::Index outer) -// : Base(unaryOp.derived().nestedExpression(),outer), m_functor(unaryOp.derived().functor()) -// {} -// -// EIGEN_STRONG_INLINE ReverseInnerIterator& operator--() -// { Base::operator--(); return *this; } -// -// EIGEN_STRONG_INLINE Scalar value() const { return m_functor(Base::value()); } -// -// protected: -// const UnaryOp m_functor; -// private: -// Scalar& valueRef(); -// }; - - - - - template<typename ViewOp, typename ArgType> struct unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased> : public evaluator_base<CwiseUnaryView<ViewOp,ArgType> > @@ -105,7 +76,6 @@ struct unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased> typedef CwiseUnaryView<ViewOp, ArgType> XprType; class InnerIterator; - class ReverseInnerIterator; enum { CoeffReadCost = evaluator<ArgType>::CoeffReadCost + functor_traits<ViewOp>::Cost, @@ -120,7 +90,6 @@ struct unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased> protected: typedef typename evaluator<ArgType>::InnerIterator EvalIterator; -// typedef typename evaluator<ArgType>::ReverseInnerIterator EvalReverseIterator; const ViewOp m_functor; evaluator<ArgType> m_argImpl; @@ -148,29 +117,6 @@ class unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased>::InnerItera const ViewOp m_functor; }; -// template<typename ViewOp, typename ArgType> -// class unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased>::ReverseInnerIterator -// : public unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased>::EvalReverseIterator -// { -// typedef typename XprType::Scalar Scalar; -// typedef typename unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased>::EvalReverseIterator Base; -// public: -// -// EIGEN_STRONG_INLINE ReverseInnerIterator(const XprType& unaryOp, typename XprType::Index outer) -// : Base(unaryOp.derived().nestedExpression(),outer), m_functor(unaryOp.derived().functor()) -// {} -// -// EIGEN_STRONG_INLINE ReverseInnerIterator& operator--() -// { Base::operator--(); return *this; } -// -// EIGEN_STRONG_INLINE Scalar value() const { return m_functor(Base::value()); } -// EIGEN_STRONG_INLINE Scalar& valueRef() { return m_functor(Base::valueRef()); } -// -// protected: -// const ViewOp m_functor; -// }; - - } // end namespace internal template<typename Derived> diff --git a/Eigen/src/SparseCore/SparseTranspose.h b/Eigen/src/SparseCore/SparseTranspose.h index b6f180a41..3757d4c6b 100644 --- a/Eigen/src/SparseCore/SparseTranspose.h +++ b/Eigen/src/SparseCore/SparseTranspose.h @@ -56,7 +56,6 @@ struct unary_evaluator<Transpose<ArgType>, IteratorBased> : public evaluator_base<Transpose<ArgType> > { typedef typename evaluator<ArgType>::InnerIterator EvalIterator; - typedef typename evaluator<ArgType>::ReverseInnerIterator EvalReverseIterator; public: typedef Transpose<ArgType> XprType; @@ -75,17 +74,6 @@ struct unary_evaluator<Transpose<ArgType>, IteratorBased> Index col() const { return EvalIterator::row(); } }; - class ReverseInnerIterator : public EvalReverseIterator - { - public: - EIGEN_STRONG_INLINE ReverseInnerIterator(const unary_evaluator& unaryOp, Index outer) - : EvalReverseIterator(unaryOp.m_argImpl,outer) - {} - - Index row() const { return EvalReverseIterator::col(); } - Index col() const { return EvalReverseIterator::row(); } - }; - enum { CoeffReadCost = evaluator<ArgType>::CoeffReadCost, Flags = XprType::Flags |