forgot to use new 'value' functions -> use it now; still works
This commit is contained in:
parent
174cdd4bf6
commit
143ec78355
2 changed files with 6 additions and 4 deletions
|
@ -321,7 +321,7 @@ namespace MultiArrayTools
|
||||||
constexpr size_t NEXT = Op::SIZE;
|
constexpr size_t NEXT = Op::SIZE;
|
||||||
const ExtType npos = last;
|
const ExtType npos = last;
|
||||||
const size_t pos = mIndPtr->posAt( mOp.get( npos ) );
|
const size_t pos = mIndPtr->posAt( mOp.get( npos ) );
|
||||||
const size_t mnpos = PosForward<ForType::DEFAULT>::value(mlast, mMax, pos);
|
const size_t mnpos = PosForward<ForType::DEFAULT>::valuex(mlast, mStep, pos);
|
||||||
mExpr(mnpos, Getter<NEXT>::template getX<ExtType>( npos ) );
|
mExpr(mnpos, Getter<NEXT>::template getX<ExtType>( npos ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -332,7 +332,7 @@ namespace MultiArrayTools
|
||||||
constexpr size_t NEXT = Op::SIZE;
|
constexpr size_t NEXT = Op::SIZE;
|
||||||
const ExtType npos = last;
|
const ExtType npos = last;
|
||||||
const size_t pos = mIndPtr->posAt( mOp.get( npos ) );
|
const size_t pos = mIndPtr->posAt( mOp.get( npos ) );
|
||||||
const size_t mnpos = PosForward<ForType::DEFAULT>::value(mlast, mMax, pos);
|
const size_t mnpos = PosForward<ForType::DEFAULT>::valuex(mlast, mStep, pos);
|
||||||
mExpr(mnpos, Getter<NEXT>::template getX<ExtType>( npos ));
|
mExpr(mnpos, Getter<NEXT>::template getX<ExtType>( npos ));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -190,7 +190,8 @@ namespace MultiArrayHelper
|
||||||
typedef typename IndexClass::RangeType RangeType;
|
typedef typename IndexClass::RangeType RangeType;
|
||||||
for(size_t pos = 0u; pos != ForBound<RangeType::ISSTATIC>::template bound<RangeType::SIZE>(mMax); ++pos){
|
for(size_t pos = 0u; pos != ForBound<RangeType::ISSTATIC>::template bound<RangeType::SIZE>(mMax); ++pos){
|
||||||
//for(size_t pos = mSPos; pos != mMax; ++pos){
|
//for(size_t pos = mSPos; pos != mMax; ++pos){
|
||||||
const size_t mnpos = PosForward<FT>::value(mlast, mMax, pos);
|
//const size_t mnpos = PosForward<FT>::value(mlast, mMax, pos);
|
||||||
|
const size_t mnpos = PosForward<FT>::valuex(mlast, mStep, pos);
|
||||||
const ExtType npos = last + mExt*pos;
|
const ExtType npos = last + mExt*pos;
|
||||||
mExpr(mnpos, npos);
|
mExpr(mnpos, npos);
|
||||||
}
|
}
|
||||||
|
@ -203,7 +204,8 @@ namespace MultiArrayHelper
|
||||||
const ExtType last;
|
const ExtType last;
|
||||||
for(size_t pos = 0u; pos != ForBound<RangeType::ISSTATIC>::template bound<RangeType::SIZE>(mMax); ++pos){
|
for(size_t pos = 0u; pos != ForBound<RangeType::ISSTATIC>::template bound<RangeType::SIZE>(mMax); ++pos){
|
||||||
//for(size_t pos = mSPos; pos != mMax; ++pos){
|
//for(size_t pos = mSPos; pos != mMax; ++pos){
|
||||||
const size_t mnpos = PosForward<FT>::value(mlast, mMax, pos);
|
//const size_t mnpos = PosForward<FT>::value(mlast, mMax, pos);
|
||||||
|
const size_t mnpos = PosForward<FT>::valuex(mlast, mStep, pos);
|
||||||
const ExtType npos = last + mExt*pos;
|
const ExtType npos = last + mExt*pos;
|
||||||
mExpr(mnpos, npos);
|
mExpr(mnpos, npos);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue