mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-15 07:10:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

name changes 2

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

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

@ -134,7 +134,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
>
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& coeff(const CustomIndices & indices) const
{
return coeff(internal::CustomIndices2Array<Index,NumIndices>(indices));
return coeff(internal::customIndices2Array<Index,NumIndices>(indices));
}
@ -168,7 +168,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
>
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& coeffRef(const CustomIndices & indices)
{
return coeffRef(internal::CustomIndices2Array<Index,NumIndices>(indices));
return coeffRef(internal::customIndices2Array<Index,NumIndices>(indices));
}
@ -216,7 +216,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& operator()(const CustomIndices & indices) const
{
//eigen_assert(checkIndexRange(indices)); /* already in coeff */
return coeff(internal::CustomIndices2Array<Index,NumIndices>(indices));
return coeff(internal::customIndices2Array<Index,NumIndices>(indices));
}
// normal indices
@ -284,7 +284,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& operator()(const CustomIndices & indices)
{
//eigen_assert(checkIndexRange(indices)); /* already in coeff */
return coeffRef(internal::CustomIndices2Array<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::CustomIndices2Array<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::CustomIndices2Array<Index,NumIndices>(dimensions));
return coeffRef(internal::customIndices2Array<Index,NumIndices>(dimensions));
}

6
unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h
View File

@ -93,15 +93,15 @@ namespace internal{
template<typename IndexType, Index... Is>
EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
array<Index,sizeof...(Is)> customIndex2Array(const IndexType & idx, numeric_list<Index,Is...>) {
array<Index,sizeof...(Is)> customIndices2Array(const IndexType & idx, numeric_list<Index,Is...>) {
return { idx(Is)... };
}
/** Make an array (for index/dimensions) out of a custom index */
template<typename Index, int NumIndices, typename IndexType>
EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
array<Index,NumIndices> customIndex2Array(const IndexType & idx) {
return customIndex2Array(idx, typename gen_numeric_list<Index,NumIndices>::type{});
array<Index,NumIndices> customIndices2Array(const IndexType & idx) {
return customIndices2Array(idx, typename gen_numeric_list<Index,NumIndices>::type{});
}