GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-14 20:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the coefficient accessors use for the 2d and 3d case when compiling without cxx11 support.

Browse Source
This commit is contained in:
Benoit Steiner 2015-12-10 22:45:10 -08:00
parent 9db8316c93
commit 8e00ea9a92
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unsupported/Eigen/CXX11/src/Tensor/TensorMap.h
View File

@ -49,7 +49,7 @@ template<typename PlainObjectType, int Options_> class TensorMap : public Tensor
IsAligned = ((int(Options_)&Aligned)==Aligned), IsAligned = ((int(Options_)&Aligned)==Aligned),
PacketAccess = (internal::packet_traits<Scalar>::size > 1), PacketAccess = (internal::packet_traits<Scalar>::size > 1),
Layout = PlainObjectType::Layout, Layout = PlainObjectType::Layout,
CoordAccess = true, CoordAccess = true
}; };
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
@ -158,7 +158,7 @@ template<typename PlainObjectType, int Options_> class TensorMap : public Tensor
EIGEN_STRONG_INLINE const Scalar& operator()(Index i0, Index i1) const EIGEN_STRONG_INLINE const Scalar& operator()(Index i0, Index i1) const
{ {
if (PlainObjectType::Options&RowMajor) { if (PlainObjectType::Options&RowMajor) {
const Index index = i1 + i0 * m_dimensions[0]; const Index index = i1 + i0 * m_dimensions[1];
return m_data[index]; return m_data[index];
} else { } else {
const Index index = i0 + i1 * m_dimensions[0]; const Index index = i0 + i1 * m_dimensions[0];
@ -169,7 +169,7 @@ template<typename PlainObjectType, int Options_> class TensorMap : public Tensor
EIGEN_STRONG_INLINE const Scalar& operator()(Index i0, Index i1, Index i2) const EIGEN_STRONG_INLINE const Scalar& operator()(Index i0, Index i1, Index i2) const
{ {
if (PlainObjectType::Options&RowMajor) { if (PlainObjectType::Options&RowMajor) {
const Index index = i2 + m_dimensions[1] * (i1 + m_dimensions[0] * i0); const Index index = i2 + m_dimensions[2] * (i1 + m_dimensions[1] * i0);
return m_data[index]; return m_data[index];
} else { } else {
const Index index = i0 + m_dimensions[0] * (i1 + m_dimensions[1] * i2); const Index index = i0 + m_dimensions[0] * (i1 + m_dimensions[1] * i2);
@ -245,7 +245,7 @@ template<typename PlainObjectType, int Options_> class TensorMap : public Tensor
EIGEN_STRONG_INLINE Scalar& operator()(Index i0, Index i1) EIGEN_STRONG_INLINE Scalar& operator()(Index i0, Index i1)
{ {
if (PlainObjectType::Options&RowMajor) { if (PlainObjectType::Options&RowMajor) {
const Index index = i1 + i0 * m_dimensions[0]; const Index index = i1 + i0 * m_dimensions[1];
return m_data[index]; return m_data[index];
} else { } else {
const Index index = i0 + i1 * m_dimensions[0]; const Index index = i0 + i1 * m_dimensions[0];
@ -256,7 +256,7 @@ template<typename PlainObjectType, int Options_> class TensorMap : public Tensor
EIGEN_STRONG_INLINE Scalar& operator()(Index i0, Index i1, Index i2) EIGEN_STRONG_INLINE Scalar& operator()(Index i0, Index i1, Index i2)
{ {
if (PlainObjectType::Options&RowMajor) { if (PlainObjectType::Options&RowMajor) {
const Index index = i2 + m_dimensions[1] * (i1 + m_dimensions[0] * i0); const Index index = i2 + m_dimensions[2] * (i1 + m_dimensions[1] * i0);
return m_data[index]; return m_data[index];
} else { } else {
const Index index = i0 + m_dimensions[0] * (i1 + m_dimensions[1] * i2); const Index index = i0 + m_dimensions[0] * (i1 + m_dimensions[1] * i2);