mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-02-23 18:20:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

name changes

Browse Source 
user: Gabriel Nützi <gnuetzi@gmx.ch>
branch 'default'
changed unsupported/Eigen/CXX11/src/Tensor/Tensor.h
This commit is contained in:
Gabriel Nützi 2015-10-09 19:08:14 +02:00
parent 6edae2d30d
commit 7b34834f64
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
unsupported/Eigen/CXX11/src/Tensor/Tensor.h
View File

@ -88,9 +88,9 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
protected:
TensorStorage<Scalar, Dimensions, Options> m_storage;
template<typename CustomIndex>
template<typename CustomIndices>
struct isOfNormalIndex{
static const bool value = internal::is_base_of< array<Index, NumIndices>, CustomIndex >::value;
static const bool value = internal::is_base_of< array<Index, NumIndices>, CustomIndices >::value;
};
public:
@ -121,20 +121,20 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
#endif
/** Normal Index */
// normal indices
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& coeff(const array<Index, NumIndices>& indices) const
{
eigen_internal_assert(checkIndexRange(indices));
return m_storage.data()[linearizedIndex(indices)];
}
/** Custom Index */
template<typename CustomIndex,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomIndex>::value) )
// custom indices
template<typename CustomIndices,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomIndices>::value) )
>
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& coeff(const CustomIndex & indices) const
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& coeff(const CustomIndices & indices) const
{
return coeff(internal::customIndex2Array<Index,NumIndices>(indices));
return coeff(internal::CustomIndices2Array<Index,NumIndices>(indices));
}
@ -155,20 +155,20 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
}
#endif
/** Normal Index */
// normal indices
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& coeffRef(const array<Index, NumIndices>& indices)
{
eigen_internal_assert(checkIndexRange(indices));
return m_storage.data()[linearizedIndex(indices)];
}
/** Custom Index */
template<typename CustomIndex,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomIndex>::value) )
// custom indices
template<typename CustomIndices,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomIndices>::value) )
>
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& coeffRef(const CustomIndex & indices)
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& coeffRef(const CustomIndices & indices)
{
return coeffRef(internal::customIndex2Array<Index,NumIndices>(indices));
return coeffRef(internal::CustomIndices2Array<Index,NumIndices>(indices));
}
@ -209,17 +209,17 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
}
#endif
/** Custom Index */
template<typename CustomIndex,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomIndex>::value) )
// custom indices
template<typename CustomIndices,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomIndices>::value) )
>
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& operator()(const CustomIndex & indices) const
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& operator()(const CustomIndices & indices) const
{
//eigen_assert(checkIndexRange(indices)); /* already in coeff */
return coeff(internal::customIndex2Array<Index,NumIndices>(indices));
return coeff(internal::CustomIndices2Array<Index,NumIndices>(indices));
}
/** Normal Index */
// normal indices
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& operator()(const array<Index, NumIndices>& indices) const
{
//eigen_assert(checkIndexRange(indices)); /* already in coeff */
@ -270,21 +270,21 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
}
#endif
/** Normal Index */
// normal indices
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& operator()(const array<Index, NumIndices>& indices)
{
//eigen_assert(checkIndexRange(indices)); /* already in coeff */
return coeffRef(indices);
}
/** Custom Index */
template<typename CustomIndex,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomIndex>::value) )
// custom indices
template<typename CustomIndices,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomIndices>::value) )
>
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& operator()(const CustomIndex & indices)
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& operator()(const CustomIndices & indices)
{
//eigen_assert(checkIndexRange(indices)); /* already in coeff */
return coeffRef(internal::customIndex2Array<Index,NumIndices>(indices));
return coeffRef(internal::CustomIndices2Array<Index,NumIndices>(indices));
}
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& operator()(Index index)
@ -359,7 +359,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
template<typename CustomDimension,
EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomDimension>::value) )
>
inline explicit Tensor(const CustomDimension & dimensions) : Tensor(internal::customIndex2Array<Index,NumIndices>(dimensions))
inline explicit Tensor(const CustomDimension & dimensions) : Tensor(internal::CustomIndices2Array<Index,NumIndices>(dimensions))
{}
template<typename OtherDerived>
@ -446,7 +446,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void resize(const CustomDimension & dimensions)
{
//eigen_assert(checkIndexRange(indices)); /* already in coeff */
return coeffRef(internal::customIndex2Array<Index,NumIndices>(dimensions));
return coeffRef(internal::CustomIndices2Array<Index,NumIndices>(dimensions));
}