finish re-sorting code and files
This commit is contained in:
parent
7a716d662d
commit
dad295ef37
7 changed files with 22 additions and 6 deletions
|
@ -14,6 +14,8 @@
|
|||
|
||||
#include "block/block.h"
|
||||
#include "operation_utils.h"
|
||||
#include "ranges/rheader.h"
|
||||
#include "pack_num.h"
|
||||
|
||||
namespace MultiArrayTools
|
||||
{
|
||||
|
|
|
@ -1,9 +1,15 @@
|
|||
|
||||
#include "operation_utils.h"
|
||||
#include "ranges/range_base.h"
|
||||
|
||||
namespace MultiArrayTools
|
||||
{
|
||||
|
||||
namespace
|
||||
{
|
||||
using namespace MultiArrayHelper;
|
||||
}
|
||||
|
||||
void seekIndexInst(std::shared_ptr<VIWB> i, std::vector<std::shared_ptr<VIWB> >& ivec)
|
||||
{
|
||||
for(size_t inum = 0; inum != i->rangePtr()->dim(); ++inum){
|
||||
|
|
|
@ -13,6 +13,11 @@
|
|||
namespace MultiArrayTools
|
||||
{
|
||||
|
||||
namespace
|
||||
{
|
||||
using namespace MultiArrayHelper;
|
||||
}
|
||||
|
||||
// <block type, step size within actual instance>
|
||||
typedef std::pair<BlockType,size_t> BTSS;
|
||||
|
||||
|
|
|
@ -24,13 +24,13 @@ namespace MultiArrayHelper
|
|||
{
|
||||
auto subvec = std::move( std::get<N>(ops).block(idxPtr) );
|
||||
btv.insert(btv.end(), subvec.begin(), subvec.end() );
|
||||
BPackNum<N-1>::makeBlockTypeVec(btv, ops, idxPtr);
|
||||
PackNum<N-1>::makeBlockTypeVec(btv, ops, idxPtr);
|
||||
}
|
||||
|
||||
template <typename T, class Func, class ArgTuple, class... Args>
|
||||
static BlockResult<T> unpackArgs(const ArgTuple& tp, const Args&... args)
|
||||
{
|
||||
return BPackNum<N-1>::template unpackArgs<T,Func>(tp, std::get<N>(tp).get(), args...);
|
||||
return PackNum<N-1>::template unpackArgs<T,Func>(tp, std::get<N>(tp).get(), args...);
|
||||
}
|
||||
|
||||
template <typename... T>
|
||||
|
|
|
@ -13,7 +13,6 @@ namespace MultiArrayTools
|
|||
{
|
||||
class RangeBase;
|
||||
}
|
||||
|
||||
#include "vindex_base.h"
|
||||
|
||||
namespace MultiArrayTools
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#ifndef __pack_num_h__
|
||||
#define __pack_num_h__
|
||||
#ifndef __rpack_num_h__
|
||||
#define __rpack_num_h__
|
||||
|
||||
#include <memory>
|
||||
#include "vindex_wrapper.h"
|
||||
|
|
|
@ -8,6 +8,10 @@
|
|||
namespace MultiArrayTools
|
||||
{
|
||||
|
||||
#ifndef __range_base_h__
|
||||
class RangeBase;
|
||||
#endif
|
||||
|
||||
class VirtualIndexWrapperBase
|
||||
{
|
||||
public:
|
||||
|
|
Loading…
Reference in a new issue