devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Since there is no reason for evaluators to be nested by reference, let's remove the evaluator<>::nestedType indirection.

Browse Source
This commit is contained in:
Gael Guennebaud
2015-09-02 22:10:39 +02:00
parent 51455824ea
commit aa768add0b
17 changed files with 35 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/SparseCore/SparseBlock.h
View File

@@ -456,7 +456,7 @@ struct unary_evaluator<Block<ArgType,BlockRows,BlockCols,InnerPanel>, IteratorBa
protected:
typedef typename evaluator<ArgType>::InnerIterator EvalIterator;
typename evaluator<ArgType>::nestedType m_argImpl;
evaluator<ArgType> m_argImpl;
const XprType &m_block;
};

16
Eigen/src/SparseCore/SparseCwiseBinaryOp.h
View File

@@ -146,8 +146,8 @@ public:
protected:
const BinaryOp m_functor;
typename evaluator<Lhs>::nestedType m_lhsImpl;
typename evaluator<Rhs>::nestedType m_rhsImpl;
evaluator<Lhs> m_lhsImpl;
evaluator<Rhs> m_rhsImpl;
};
// "sparse .* sparse"
@@ -227,8 +227,8 @@ public:
protected:
const BinaryOp m_functor;
typename evaluator<Lhs>::nestedType m_lhsImpl;
typename evaluator<Rhs>::nestedType m_rhsImpl;
evaluator<Lhs> m_lhsImpl;
evaluator<Rhs> m_rhsImpl;
};
// "dense .* sparse"
@@ -295,8 +295,8 @@ public:
protected:
const BinaryOp m_functor;
typename evaluator<Lhs>::nestedType m_lhsImpl;
typename evaluator<Rhs>::nestedType m_rhsImpl;
evaluator<Lhs> m_lhsImpl;
evaluator<Rhs> m_rhsImpl;
};
// "sparse .* dense"
@@ -364,8 +364,8 @@ public:
protected:
const BinaryOp m_functor;
typename evaluator<Lhs>::nestedType m_lhsImpl;
typename evaluator<Rhs>::nestedType m_rhsImpl;
evaluator<Lhs> m_lhsImpl;
evaluator<Rhs> m_rhsImpl;
};
}

4
Eigen/src/SparseCore/SparseCwiseUnaryOp.h
View File

@@ -40,7 +40,7 @@ struct unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased>
// typedef typename evaluator<ArgType>::ReverseInnerIterator EvalReverseIterator;
const UnaryOp m_functor;
typename evaluator<ArgType>::nestedType m_argImpl;
evaluator<ArgType> m_argImpl;
};
template<typename UnaryOp, typename ArgType>
@@ -115,7 +115,7 @@ struct unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased>
// typedef typename evaluator<ArgType>::ReverseInnerIterator EvalReverseIterator;
const ViewOp m_functor;
typename evaluator<ArgType>::nestedType m_argImpl;
evaluator<ArgType> m_argImpl;
};
template<typename ViewOp, typename ArgType>

4
Eigen/src/SparseCore/SparseDenseProduct.h
View File

@@ -272,8 +272,8 @@ public:
protected:
const LhsArg m_lhs;
typename evaluator<ActualLhs>::nestedType m_lhsXprImpl;
typename evaluator<ActualRhs>::nestedType m_rhsXprImpl;
evaluator<ActualLhs> m_lhsXprImpl;
evaluator<ActualRhs> m_rhsXprImpl;
};
// sparse * dense outer product

6
Eigen/src/SparseCore/SparseDiagonalProduct.h
View File

@@ -39,7 +39,6 @@ struct product_evaluator<Product<Lhs, Rhs, DefaultProduct>, ProductTag, Diagonal
: public sparse_diagonal_product_evaluator<Rhs, typename Lhs::DiagonalVectorType, Rhs::Flags&RowMajorBit?SDP_AsScalarProduct:SDP_AsCwiseProduct>
{
typedef Product<Lhs, Rhs, DefaultProduct> XprType;
typedef evaluator<XprType> nestedType;
enum { CoeffReadCost = Dynamic, Flags = Rhs::Flags&RowMajorBit, Alignment = 0 }; // FIXME CoeffReadCost & Flags
typedef sparse_diagonal_product_evaluator<Rhs, typename Lhs::DiagonalVectorType, Rhs::Flags&RowMajorBit?SDP_AsScalarProduct:SDP_AsCwiseProduct> Base;
@@ -51,7 +50,6 @@ struct product_evaluator<Product<Lhs, Rhs, DefaultProduct>, ProductTag, SparseSh
: public sparse_diagonal_product_evaluator<Lhs, Transpose<const typename Rhs::DiagonalVectorType>, Lhs::Flags&RowMajorBit?SDP_AsCwiseProduct:SDP_AsScalarProduct>
{
typedef Product<Lhs, Rhs, DefaultProduct> XprType;
typedef evaluator<XprType> nestedType;
enum { CoeffReadCost = Dynamic, Flags = Lhs::Flags&RowMajorBit, Alignment = 0 }; // FIXME CoeffReadCost & Flags
typedef sparse_diagonal_product_evaluator<Lhs, Transpose<const typename Rhs::DiagonalVectorType>, Lhs::Flags&RowMajorBit?SDP_AsCwiseProduct:SDP_AsScalarProduct> Base;
@@ -84,8 +82,8 @@ public:
{}
protected:
typename evaluator<SparseXprType>::nestedType m_sparseXprImpl;
typename evaluator<DiagonalCoeffType>::nestedType m_diagCoeffImpl;
evaluator<SparseXprType> m_sparseXprImpl;
evaluator<DiagonalCoeffType> m_diagCoeffImpl;
};

2
Eigen/src/SparseCore/SparseProduct.h
View File

@@ -69,8 +69,6 @@ struct evaluator<SparseView<Product<Lhs, Rhs, Options> > >
typedef typename XprType::PlainObject PlainObject;
typedef evaluator<PlainObject> Base;
typedef evaluator nestedType;
explicit evaluator(const XprType& xpr)
: m_result(xpr.rows(), xpr.cols())
{

2
Eigen/src/SparseCore/SparseTranspose.h
View File

@@ -92,7 +92,7 @@ struct unary_evaluator<Transpose<ArgType>, IteratorBased>
explicit unary_evaluator(const XprType& op) :m_argImpl(op.nestedExpression()) {}
protected:
typename evaluator<ArgType>::nestedType m_argImpl;
evaluator<ArgType> m_argImpl;
};
} // end namespace internal

4
Eigen/src/SparseCore/SparseView.h
View File

@@ -114,7 +114,7 @@ struct unary_evaluator<SparseView<ArgType>, IteratorBased>
explicit unary_evaluator(const XprType& xpr) : m_argImpl(xpr.nestedExpression()), m_view(xpr) {}
protected:
typename evaluator<ArgType>::nestedType m_argImpl;
evaluator<ArgType> m_argImpl;
const XprType &m_view;
};
@@ -182,7 +182,7 @@ struct unary_evaluator<SparseView<ArgType>, IndexBased>
explicit unary_evaluator(const XprType& xpr) : m_argImpl(xpr.nestedExpression()), m_view(xpr) {}
protected:
typename evaluator<ArgType>::nestedType m_argImpl;
evaluator<ArgType> m_argImpl;
const XprType &m_view;
};