diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-06-16 14:54:31 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-06-16 14:54:31 +0000 |
| commit | bb1f4e44f10de50b5b52a3973324c1a0952e3f29 (patch) | |
| tree | adf665eb4257e09edf640e23cc621e7d178d0cbd /Eigen/src/Core/CwiseBinaryOp.h | |
| parent | 9857764ae7f907e5cf441ebf6348f581f874dd00 (diff) | |
* Block: row and column expressions in the inner direction
now have the Like1D flag.
* Big renaming:
packetCoeff ---> packet
VectorizableBit ---> PacketAccessBit
Like1DArrayBit ---> LinearAccessBit
Diffstat (limited to 'Eigen/src/Core/CwiseBinaryOp.h')
| -rw-r--r-- | Eigen/src/Core/CwiseBinaryOp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/Core/CwiseBinaryOp.h b/Eigen/src/Core/CwiseBinaryOp.h index 6b532dbd7..b12aa65bd 100644 --- a/Eigen/src/Core/CwiseBinaryOp.h +++ b/Eigen/src/Core/CwiseBinaryOp.h @@ -67,9 +67,9 @@ struct ei_traits<CwiseBinaryOp<BinaryOp, Lhs, Rhs> > MaxColsAtCompileTime = Lhs::MaxColsAtCompileTime, Flags = (int(LhsFlags) | int(RhsFlags)) & ( HereditaryBits - | (int(LhsFlags) & int(RhsFlags) & Like1DArrayBit) - | (ei_functor_traits<BinaryOp>::IsVectorizable && ((int(LhsFlags) & RowMajorBit)==(int(RhsFlags) & RowMajorBit)) - ? int(LhsFlags) & int(RhsFlags) & VectorizableBit : 0)), + | (int(LhsFlags) & int(RhsFlags) & LinearAccessBit) + | (ei_functor_traits<BinaryOp>::PacketAccess && ((int(LhsFlags) & RowMajorBit)==(int(RhsFlags) & RowMajorBit)) + ? int(LhsFlags) & int(RhsFlags) & PacketAccessBit : 0)), CoeffReadCost = LhsCoeffReadCost + RhsCoeffReadCost + ei_functor_traits<BinaryOp>::Cost }; }; @@ -101,9 +101,9 @@ class CwiseBinaryOp : ei_no_assignment_operator, } template<int LoadMode> - inline PacketScalar _packetCoeff(int row, int col) const + inline PacketScalar _packet(int row, int col) const { - return m_functor.packetOp(m_lhs.template packetCoeff<LoadMode>(row, col), m_rhs.template packetCoeff<LoadMode>(row, col)); + return m_functor.packetOp(m_lhs.template packet<LoadMode>(row, col), m_rhs.template packet<LoadMode>(row, col)); } protected: |