ranges/container_range.h -> container_index.h
This commit is contained in:
parent
98138114f7
commit
63df6bbdef
6 changed files with 17 additions and 28 deletions
|
@ -1,7 +1,7 @@
|
||||||
// -*- C++ -*-
|
// -*- C++ -*-
|
||||||
|
|
||||||
#ifndef __container_range_h__
|
#ifndef __container_index_h__
|
||||||
#define __container_range_h__
|
#define __container_index_h__
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
@ -9,6 +9,9 @@
|
||||||
|
|
||||||
#include "ranges/range_base.h"
|
#include "ranges/range_base.h"
|
||||||
#include "ranges/index_base.h"
|
#include "ranges/index_base.h"
|
||||||
|
#include "mbase_def.h"
|
||||||
|
#include "statics/static_for.h"
|
||||||
|
#include "ranges/range_helper.h"
|
||||||
|
|
||||||
namespace MultiArrayTools
|
namespace MultiArrayTools
|
||||||
{
|
{
|
|
@ -11,6 +11,16 @@ namespace MultiArrayTools
|
||||||
* Provided Types *
|
* Provided Types *
|
||||||
***********************/
|
***********************/
|
||||||
|
|
||||||
|
template <class... Ranges>
|
||||||
|
using ContainerRangeFactory = MultiRangeFactory<Ranges...>;
|
||||||
|
|
||||||
|
template <class... Ranges>
|
||||||
|
using ContainerRange = MultiRange<Ranges...>;
|
||||||
|
|
||||||
|
// container_index.h
|
||||||
|
template <typename T, class... Indices>
|
||||||
|
class ConstContainerIndex;
|
||||||
|
|
||||||
// multi_array.h
|
// multi_array.h
|
||||||
template <typename T, class... SRanges>
|
template <typename T, class... SRanges>
|
||||||
class MultiArrayBase;
|
class MultiArrayBase;
|
||||||
|
@ -27,10 +37,6 @@ namespace MultiArrayTools
|
||||||
template <typename T, class OperationClass>
|
template <typename T, class OperationClass>
|
||||||
class OperationBase;
|
class OperationBase;
|
||||||
|
|
||||||
// multi_array_operation.h
|
|
||||||
//template <typename T>
|
|
||||||
//class MutableOperationBase;
|
|
||||||
|
|
||||||
// multi_array_operation.h
|
// multi_array_operation.h
|
||||||
template <typename T, class OperationClass>
|
template <typename T, class OperationClass>
|
||||||
class OperationTemplate;
|
class OperationTemplate;
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#define __multi_array_header_h__
|
#define __multi_array_header_h__
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
#include "container_index.h"
|
||||||
#include "multi_array_operation.h"
|
#include "multi_array_operation.h"
|
||||||
#include "multi_array_base.h"
|
#include "multi_array_base.h"
|
||||||
#include "multi_array.h"
|
#include "multi_array.h"
|
||||||
|
@ -13,7 +14,6 @@
|
||||||
#include "map_range.h"
|
#include "map_range.h"
|
||||||
#include "dynamic_operation.h"
|
#include "dynamic_operation.h"
|
||||||
#include "high_level_operation.h"
|
#include "high_level_operation.h"
|
||||||
//#include "expressions.h"
|
|
||||||
|
|
||||||
#include "multi_array_header.cc.h"
|
#include "multi_array_header.cc.h"
|
||||||
|
|
||||||
|
|
|
@ -80,18 +80,6 @@ namespace MultiArrayTools
|
||||||
template <class... Indices>
|
template <class... Indices>
|
||||||
class MultiIndex;
|
class MultiIndex;
|
||||||
|
|
||||||
// container_range.h
|
|
||||||
template <class... Ranges>
|
|
||||||
using ContainerRangeFactory = MultiRangeFactory<Ranges...>;
|
|
||||||
|
|
||||||
// container_range.h
|
|
||||||
template <class... Ranges>
|
|
||||||
using ContainerRange = MultiRange<Ranges...>;
|
|
||||||
|
|
||||||
// container_range.h
|
|
||||||
template <typename T, class... Indices>
|
|
||||||
class ConstContainerIndex;
|
|
||||||
|
|
||||||
// anonymous_range.h
|
// anonymous_range.h
|
||||||
class AnonymousRangeFactory;
|
class AnonymousRangeFactory;
|
||||||
|
|
||||||
|
@ -103,15 +91,12 @@ namespace MultiArrayTools
|
||||||
class IndexWrapper;
|
class IndexWrapper;
|
||||||
|
|
||||||
// dynamic_range.h
|
// dynamic_range.h
|
||||||
//template <class EC>
|
|
||||||
class DynamicIndex;
|
class DynamicIndex;
|
||||||
|
|
||||||
// dynamic_range.h
|
// dynamic_range.h
|
||||||
//template <class EC>
|
|
||||||
class DynamicRangeFactory;
|
class DynamicRangeFactory;
|
||||||
|
|
||||||
// dynamic_range.h
|
// dynamic_range.h
|
||||||
//template <class EC>
|
|
||||||
class DynamicRange;
|
class DynamicRange;
|
||||||
|
|
||||||
// value_range.h
|
// value_range.h
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
#include "single_range.h"
|
#include "single_range.h"
|
||||||
#include "multi_range.h"
|
#include "multi_range.h"
|
||||||
#include "container_range.h"
|
|
||||||
#include "subrange.h"
|
#include "subrange.h"
|
||||||
//#include "anonymous_range.h"
|
//#include "anonymous_range.h"
|
||||||
|
|
||||||
|
|
|
@ -4,11 +4,7 @@
|
||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include "ranges/rheader.h"
|
#include "multi_array_header.h"
|
||||||
//#include "expressions.h"
|
|
||||||
//#include "ranges/dynamic_range.cc.h"
|
|
||||||
//#include "multi_array_header.h"
|
|
||||||
#include "ranges/ranges_header.cc.h"
|
|
||||||
|
|
||||||
namespace MAT = MultiArrayTools;
|
namespace MAT = MultiArrayTools;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue