chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some corrections...

Browse source
This commit is contained in:
Christian Zimmermann 2017-12-25 13:44:55 +01:00
parent c349ff7bd0
commit a8c62d0481
6 changed files with 105 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
src/multi_array_operation.h
View file

@ -17,6 +17,8 @@
#include "ranges/rheader.h" #include "ranges/rheader.h"
#include "pack_num.h" #include "pack_num.h"
#include "ranges/index_info.h"
namespace MultiArrayTools namespace MultiArrayTools
{ {
@ -54,7 +56,8 @@ namespace MultiArrayTools
{ {
public: public:
OperationTemplate(OperationClass* oc); OperationClass& THIS() { return static_cast<OperationClass&>(*this); }
const OperationClass& THIS() const { return static_cast<OperationClass const&>(*this); }
template <class Second> template <class Second>
auto operator+(const Second& in) const auto operator+(const Second& in) const
@ -77,7 +80,8 @@ namespace MultiArrayTools
-> Contraction<T,OperationClass,IndexType>; -> Contraction<T,OperationClass,IndexType>;
private: private:
OperationClass* mOc; friend OperationClass;
OperationTemplate() = default;
}; };
template <typename T, class OpClass, class... Ranges> template <typename T, class OpClass, class... Ranges>
@ -104,11 +108,13 @@ namespace MultiArrayTools
const OperationMaster& block() const; const OperationMaster& block() const;
protected: protected:
std::shared_ptr<IndexType> mkIndex(std::shared_ptr<typename CRange::IndexType>& index);
void performAssignment(std::intptr_t blockIndexNum); void performAssignment(std::intptr_t blockIndexNum);
OpClass const& mSecond; OpClass const& mSecond;
MutableMultiArrayBase<T,Ranges...>& mArrayRef; MutableMultiArrayBase<T,Ranges...>& mArrayRef;
std::shared_ptr<IndexType> mIndex; std::shared_ptr<IndexType> mIndex;
IndexInfo mIInfo;
mutable MBlock<T> mBlock; mutable MBlock<T> mBlock;
}; };
@ -134,9 +140,14 @@ namespace MultiArrayTools
const ConstOperationRoot& block() const; const ConstOperationRoot& block() const;
protected: protected:
std::shared_ptr<IndexType>
mkIndex(const MultiArrayBase<T,Ranges...>& ma,
const std::shared_ptr<typename Ranges::IndexType>&... indices);
MultiArrayBase<T,Ranges...> const& mArrayRef; MultiArrayBase<T,Ranges...> const& mArrayRef;
std::shared_ptr<IndexType> mIndex; std::shared_ptr<IndexType> mIndex;
IndexInfo mIInfo;
mutable Block<T> mBlock; mutable Block<T> mBlock;
}; };
@ -167,9 +178,14 @@ namespace MultiArrayTools
const OperationRoot& block() const; const OperationRoot& block() const;
protected: protected:
std::shared_ptr<IndexType>
mkIndex(const MultiArrayBase<T,Ranges...>& ma,
const std::shared_ptr<typename Ranges::IndexType>&... indices);
MutableMultiArrayBase<T,Ranges...>& mArrayRef; MutableMultiArrayBase<T,Ranges...>& mArrayRef;
std::shared_ptr<IndexType> mIndex; std::shared_ptr<IndexType> mIndex;
IndexInfo mIInfo;
mutable MBlock<T> mBlock; mutable MBlock<T> mBlock;
std::shared_ptr<VIWB> mBlockIndex; // predefine to save time std::shared_ptr<VIWB> mBlockIndex; // predefine to save time
}; };
@ -193,7 +209,7 @@ namespace MultiArrayTools
const Operation& block() const; const Operation& block() const;
protected: protected:
std::tuple<Ops...> mOps; std::tuple<Ops const&...> mOps;
mutable BlockResult<T> mRes; mutable BlockResult<T> mRes;
}; };
@ -214,7 +230,7 @@ namespace MultiArrayTools
protected: protected:
Op mOp; const Op& mOp;
std::shared_ptr<IndexType> mInd; std::shared_ptr<IndexType> mInd;
mutable BlockResult<T> mRes; mutable BlockResult<T> mRes;
}; };
@ -266,16 +282,13 @@ namespace MultiArrayTools
/*************************** /***************************
* OperationTemplate * * OperationTemplate *
***************************/ ***************************/
template <typename T, class OperationClass>
OperationTemplate<T,OperationClass>::OperationTemplate(OperationClass* oc) : mOc(oc) {}
template <typename T, class OperationClass> template <typename T, class OperationClass>
template <class Second> template <class Second>
auto OperationTemplate<T,OperationClass>::operator+(const Second& in) const auto OperationTemplate<T,OperationClass>::operator+(const Second& in) const
-> Operation<T,std::plus<T>,OperationClass,Second> -> Operation<T,std::plus<T>,OperationClass,Second>
{ {
return Operation<T,std::plus<T>,OperationClass,Second>(*mOc, in); return Operation<T,std::plus<T>,OperationClass,Second>(THIS(), in);
} }
template <typename T, class OperationClass> template <typename T, class OperationClass>
@ -283,7 +296,7 @@ namespace MultiArrayTools
auto OperationTemplate<T,OperationClass>::operator-(const Second& in) const auto OperationTemplate<T,OperationClass>::operator-(const Second& in) const
-> Operation<T,std::minus<T>,OperationClass,Second> -> Operation<T,std::minus<T>,OperationClass,Second>
{ {
return Operation<T,std::minus<T>,OperationClass,Second>(*mOc, in); return Operation<T,std::minus<T>,OperationClass,Second>(THIS(), in);
} }
template <typename T, class OperationClass> template <typename T, class OperationClass>
@ -291,7 +304,7 @@ namespace MultiArrayTools
auto OperationTemplate<T,OperationClass>::operator*(const Second& in) const auto OperationTemplate<T,OperationClass>::operator*(const Second& in) const
-> Operation<T,std::multiplies<T>,OperationClass,Second> -> Operation<T,std::multiplies<T>,OperationClass,Second>
{ {
return Operation<T,std::multiplies<T>,OperationClass,Second>(*mOc, in); return Operation<T,std::multiplies<T>,OperationClass,Second>(THIS(), in);
} }
template <typename T, class OperationClass> template <typename T, class OperationClass>
@ -299,7 +312,7 @@ namespace MultiArrayTools
auto OperationTemplate<T,OperationClass>::operator/(const Second& in) const auto OperationTemplate<T,OperationClass>::operator/(const Second& in) const
-> Operation<T,std::divides<T>,OperationClass,Second> -> Operation<T,std::divides<T>,OperationClass,Second>
{ {
return Operation<T,std::divides<T>,OperationClass,Second>(*mOc, in); return Operation<T,std::divides<T>,OperationClass,Second>(THIS(), in);
} }
template <typename T, class OperationClass> template <typename T, class OperationClass>
@ -307,7 +320,7 @@ namespace MultiArrayTools
auto OperationTemplate<T,OperationClass>::c(std::shared_ptr<IndexType>& ind) const auto OperationTemplate<T,OperationClass>::c(std::shared_ptr<IndexType>& ind) const
-> Contraction<T,OperationClass,IndexType> -> Contraction<T,OperationClass,IndexType>
{ {
return Contraction<T,OperationClass,IndexType>(*mOc, ind); return Contraction<T,OperationClass,IndexType>(THIS(), ind);
} }
@ -319,14 +332,8 @@ namespace MultiArrayTools
OperationMaster<T,OpClass,Ranges...>:: OperationMaster<T,OpClass,Ranges...>::
OperationMaster(MutableMultiArrayBase<T,Ranges...>& ma, const OpClass& second, OperationMaster(MutableMultiArrayBase<T,Ranges...>& ma, const OpClass& second,
std::shared_ptr<typename CRange::IndexType>& index) : std::shared_ptr<typename CRange::IndexType>& index) :
mSecond(second), mArrayRef(ma), mIndex() mSecond(second), mArrayRef(ma), mIndex(mkIndex(index)), mIInfo(*mIndex)
{ {
MultiRangeFactory<Ranges...> mrf( index->range() );
std::shared_ptr<MultiRange<Ranges...> > mr =
std::dynamic_pointer_cast<MultiRange<Ranges...> >( mrf.create() );
mIndex = std::make_shared<IndexType>( mr->begin() );
(*mIndex) = *index;
auto blockIndex = seekBlockIndex( make_viwb( mIndex ), second); auto blockIndex = seekBlockIndex( make_viwb( mIndex ), second);
std::intptr_t blockIndexNum = blockIndex->getPtrNum(); std::intptr_t blockIndexNum = blockIndex->getPtrNum();
@ -341,22 +348,29 @@ namespace MultiArrayTools
OperationMaster(MutableMultiArrayBase<T,Ranges...>& ma, const OpClass& second, OperationMaster(MutableMultiArrayBase<T,Ranges...>& ma, const OpClass& second,
std::shared_ptr<typename CRange::IndexType>& index, std::shared_ptr<typename CRange::IndexType>& index,
std::shared_ptr<VIWB> blockIndex) : std::shared_ptr<VIWB> blockIndex) :
mSecond(second), mArrayRef(ma), mIndex() mSecond(second), mArrayRef(ma), mIndex(mkIndex(index)), mIInfo(*mIndex)
{ {
MultiRangeFactory<Ranges...> mrf( index->range() );
std::shared_ptr<MultiRange<Ranges...> > mr =
std::dynamic_pointer_cast<MultiRange<Ranges...> >( mrf.create() );
mIndex = std::make_shared<IndexType>( mr->begin() );
(*mIndex) = *index;
std::intptr_t blockIndexNum = blockIndex->getPtrNum(); std::intptr_t blockIndexNum = blockIndex->getPtrNum();
second.block(blockIndex, true); second.block(blockIndex, true);
performAssignment(blockIndexNum); performAssignment(blockIndexNum);
} }
template <typename T, class OpClass, class... Ranges>
std::shared_ptr<typename OperationMaster<T,OpClass,Ranges...>::IndexType>
OperationMaster<T,OpClass,Ranges...>::
mkIndex(std::shared_ptr<typename CRange::IndexType>& index)
{
MultiRangeFactory<Ranges...> mrf( index->range() );
std::shared_ptr<MultiRange<Ranges...> > mr =
std::dynamic_pointer_cast<MultiRange<Ranges...> >( mrf.create() );
auto i = std::make_shared<IndexType>( mr->begin() );
(*i) = *index;
return i;
}
template <typename T, class OpClass, class... Ranges> template <typename T, class OpClass, class... Ranges>
void OperationMaster<T,OpClass,Ranges...>::performAssignment(std::intptr_t blockIndexNum) void OperationMaster<T,OpClass,Ranges...>::performAssignment(std::intptr_t blockIndexNum)
{ {
//size_t cnt = 0; //size_t cnt = 0;
@ -412,12 +426,21 @@ namespace MultiArrayTools
ConstOperationRoot<T,Ranges...>:: ConstOperationRoot<T,Ranges...>::
ConstOperationRoot(const MultiArrayBase<T,Ranges...>& ma, ConstOperationRoot(const MultiArrayBase<T,Ranges...>& ma,
const std::shared_ptr<typename Ranges::IndexType>&... indices) : const std::shared_ptr<typename Ranges::IndexType>&... indices) :
OperationTemplate<T,ConstOperationRoot<T,Ranges...> >(this), //OperationTemplate<T,ConstOperationRoot<T,Ranges...> >(this),
mArrayRef(ma), mIndex( std::make_shared<IndexType>( mArrayRef.range() ) ) mArrayRef(ma), mIndex( mkIndex(ma,indices...) ), mIInfo(*mIndex)
{ {}
(*mIndex)(indices...);
}
template <typename T, class... Ranges>
std::shared_ptr<typename ConstOperationRoot<T,Ranges...>::IndexType>
ConstOperationRoot<T,Ranges...>::
mkIndex(const MultiArrayBase<T,Ranges...>& ma,
const std::shared_ptr<typename Ranges::IndexType>&... indices)
{
auto i = std::make_shared<IndexType>( ma.range() );
(*mIndex)(indices...);
return i;
}
template <typename T, class... Ranges> template <typename T, class... Ranges>
const Block<T>& ConstOperationRoot<T,Ranges...>::get() const const Block<T>& ConstOperationRoot<T,Ranges...>::get() const
{ {
@ -450,13 +473,22 @@ namespace MultiArrayTools
OperationRoot<T,Ranges...>:: OperationRoot<T,Ranges...>::
OperationRoot(MutableMultiArrayBase<T,Ranges...>& ma, OperationRoot(MutableMultiArrayBase<T,Ranges...>& ma,
const std::shared_ptr<typename Ranges::IndexType>&... indices) : const std::shared_ptr<typename Ranges::IndexType>&... indices) :
OperationTemplate<T,OperationRoot<T,Ranges...> >(this), //OperationTemplate<T,OperationRoot<T,Ranges...> >(this),
mArrayRef(ma), mIndex( std::make_shared<IndexType>( mArrayRef.range() ) ), mArrayRef(ma), mIndex( mkIndex( ma, indices... ) ), mIInfo(*mIndex),
mBlockIndex(nullptr) mBlockIndex(nullptr)
{ {}
(*mIndex)(indices...);
}
template <typename T, class... Ranges>
std::shared_ptr<typename OperationRoot<T,Ranges...>::IndexType>
OperationRoot<T,Ranges...>::
mkIndex(const MultiArrayBase<T,Ranges...>& ma,
const std::shared_ptr<typename Ranges::IndexType>&... indices)
{
auto i = std::make_shared<IndexType>( ma.range() );
(*mIndex)(indices...);
return i;
}
template <typename T, class... Ranges> template <typename T, class... Ranges>
template <class OpClass> template <class OpClass>
OperationMaster<T,OpClass,Ranges...> OperationRoot<T,Ranges...>::operator=(const OpClass& in) OperationMaster<T,OpClass,Ranges...> OperationRoot<T,Ranges...>::operator=(const OpClass& in)
@ -514,7 +546,7 @@ namespace MultiArrayTools
template <typename T, class OpFunction, class... Ops> template <typename T, class OpFunction, class... Ops>
Operation<T,OpFunction,Ops...>::Operation(const Ops&... ops) : Operation<T,OpFunction,Ops...>::Operation(const Ops&... ops) :
OperationTemplate<T,Operation<T,OpFunction,Ops...> >(this), //OperationTemplate<T,Operation<T,OpFunction,Ops...> >(this),
mOps(ops...) {} mOps(ops...) {}
template <typename T, class OpFunction, class... Ops> template <typename T, class OpFunction, class... Ops>
@ -548,7 +580,7 @@ namespace MultiArrayTools
template <typename T, class Op, class IndexType> template <typename T, class Op, class IndexType>
Contraction<T,Op,IndexType>::Contraction(const Op& op, std::shared_ptr<IndexType> ind) : Contraction<T,Op,IndexType>::Contraction(const Op& op, std::shared_ptr<IndexType> ind) :
OperationTemplate<T,Contraction<T,Op,IndexType> >(this), //OperationTemplate<T,Contraction<T,Op,IndexType> >(this),
mOp(op), mOp(op),
mInd(ind) {} mInd(ind) {}

2
src/operation_utils.h
View file

@ -23,6 +23,8 @@ namespace MultiArrayTools
void seekIndexInst(std::shared_ptr<VIWB> i, std::vector<std::shared_ptr<VIWB> >& ivec); void seekIndexInst(std::shared_ptr<VIWB> i, std::vector<std::shared_ptr<VIWB> >& ivec);
//void seekIndexInst(const IndexInfo& i, std::vector<IndexInfo>& ivec);
BTSS getBlockType(std::shared_ptr<VIWB> i, BTSS getBlockType(std::shared_ptr<VIWB> i,
std::shared_ptr<VIWB> j, std::shared_ptr<VIWB> j,

5
src/ranges/container_range.h
View file

@ -337,8 +337,9 @@ namespace MultiArrayTools
template <class... Indices> template <class... Indices>
std::vector<IndexInfo> ContainerIndex<Indices...>::infoVec() const std::vector<IndexInfo> ContainerIndex<Indices...>::infoVec() const
{ {
std::vector<IndexInfo> out(sizeof...(Indices)); std::vector<IndexInfo> out;
RPackNum<sizeof...(Indices)-1>::buildInfoVec(out, mIPack); out.reserve(sizeof...(Indices));
RPackNum<sizeof...(Indices)-1>::buildInfoVec(out, mIPack, mBlockSizes);
return std::move( out ); return std::move( out );
} }

17
src/ranges/index_info.h
View file

@ -20,13 +20,15 @@ namespace MultiArrayTools
IndexInfo(IndexInfo&& in) = default; IndexInfo(IndexInfo&& in) = default;
IndexInfo& operator=(IndexInfo&& in) = default; IndexInfo& operator=(IndexInfo&& in) = default;
IndexInfo(const IndexInfo& in) = default; //IndexInfo(const IndexInfo& in) = default;
IndexInfo& operator=(const IndexInfo& in) = default; //IndexInfo& operator=(const IndexInfo& in) = default;
template <class IndexClass> template <class IndexClass>
IndexInfo(const IndexClass& ind, size_t stepSize = 1); IndexInfo(const IndexClass& ind, size_t stepSize = 1);
template <class IndexClass>
IndexInfo& reassign(const IndexClass& ind, size_t stepSize = 1);
bool operator==(const IndexInfo& in) const; bool operator==(const IndexInfo& in) const;
bool operator!=(const IndexInfo& in) const; bool operator!=(const IndexInfo& in) const;
@ -64,6 +66,15 @@ namespace MultiArrayTools
mMax(ind.max()), mMax(ind.max()),
mStepSize(stepSize) mStepSize(stepSize)
{} {}
template <class IndexClass>
IndexInfo& IndexInfo::reassign(const IndexClass& ind, size_t stepSize)
{
IndexInfo ii(ind, stepSize);
(*this) = std::move(ii);
return *this;
}
} // end namespace MultiArrayTools } // end namespace MultiArrayTools

5
src/ranges/multi_range.h
View file

@ -381,8 +381,9 @@ namespace MultiArrayTools
template <class... Indices> template <class... Indices>
std::vector<IndexInfo> MultiIndex<Indices...>::infoVec() const std::vector<IndexInfo> MultiIndex<Indices...>::infoVec() const
{ {
std::vector<IndexInfo> out(sizeof...(Indices)); std::vector<IndexInfo> out;
RPackNum<sizeof...(Indices)-1>::buildInfoVec(out, mIPack); out.reserve(sizeof...(Indices));
RPackNum<sizeof...(Indices)-1>::buildInfoVec(out, mIPack, mBlockSizes);
return std::move( out ); return std::move( out );
} }

14
src/ranges/rpack_num.h
View file

@ -211,10 +211,12 @@ namespace MultiArrayHelper
template <class... Indices> template <class... Indices>
static void buildInfoVec(std::vector<IndexInfo>& out, static void buildInfoVec(std::vector<IndexInfo>& out,
std::tuple<std::shared_ptr<Indices>...>& ip) const std::tuple<std::shared_ptr<Indices>...>& ip,
const std::array<size_t,sizeof...(Indices)+1>& bs)
{ {
out.emplace_back(*std::get<sizeof...(Indices)-N-1>(ip)); static const size_t POS = sizeof...(Indices)-N-1;
RPackNum<N-1>::buildInfoVec(out, ip); out.emplace_back(*std::get<POS>(ip), std::get<POS>(bs));
RPackNum<N-1>::buildInfoVec(out, ip, bs);
} }
}; };
@ -373,9 +375,11 @@ namespace MultiArrayHelper
template <class... Indices> template <class... Indices>
static void buildInfoVec(std::vector<IndexInfo>& out, static void buildInfoVec(std::vector<IndexInfo>& out,
std::tuple<std::shared_ptr<Indices>...>& ip) const std::tuple<std::shared_ptr<Indices>...>& ip,
const std::array<size_t,sizeof...(Indices)+1>& bs)
{ {
out.emplace_back(*std::get<sizeof...(Indices)-1>(ip)); static const size_t POS = sizeof...(Indices)-1;
out.emplace_back(*std::get<POS>(ip), std::get<POS>(bs));
} }
}; };