ranges/container_range.h -> container_index.h

This commit is contained in:
Christian Zimmermann 2021-05-28 20:35:24 +02:00
parent 98138114f7
commit 63df6bbdef
6 changed files with 17 additions and 28 deletions

View file

@ -1,7 +1,7 @@
// -*- C++ -*-
#ifndef __container_range_h__
#define __container_range_h__
#ifndef __container_index_h__
#define __container_index_h__
#include <cstdlib>
#include <tuple>
@ -9,6 +9,9 @@
#include "ranges/range_base.h"
#include "ranges/index_base.h"
#include "mbase_def.h"
#include "statics/static_for.h"
#include "ranges/range_helper.h"
namespace MultiArrayTools
{

View file

@ -11,6 +11,16 @@ namespace MultiArrayTools
* 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
template <typename T, class... SRanges>
class MultiArrayBase;
@ -27,10 +37,6 @@ namespace MultiArrayTools
template <typename T, class OperationClass>
class OperationBase;
// multi_array_operation.h
//template <typename T>
//class MutableOperationBase;
// multi_array_operation.h
template <typename T, class OperationClass>
class OperationTemplate;

View file

@ -4,6 +4,7 @@
#define __multi_array_header_h__
#include <cstdlib>
#include "container_index.h"
#include "multi_array_operation.h"
#include "multi_array_base.h"
#include "multi_array.h"
@ -13,7 +14,6 @@
#include "map_range.h"
#include "dynamic_operation.h"
#include "high_level_operation.h"
//#include "expressions.h"
#include "multi_array_header.cc.h"

View file

@ -80,18 +80,6 @@ namespace MultiArrayTools
template <class... Indices>
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
class AnonymousRangeFactory;
@ -103,15 +91,12 @@ namespace MultiArrayTools
class IndexWrapper;
// dynamic_range.h
//template <class EC>
class DynamicIndex;
// dynamic_range.h
//template <class EC>
class DynamicRangeFactory;
// dynamic_range.h
//template <class EC>
class DynamicRange;
// value_range.h

View file

@ -4,7 +4,6 @@
#include "single_range.h"
#include "multi_range.h"
#include "container_range.h"
#include "subrange.h"
//#include "anonymous_range.h"

View file

@ -4,11 +4,7 @@
#include "gtest/gtest.h"
#include <iostream>
#include "ranges/rheader.h"
//#include "expressions.h"
//#include "ranges/dynamic_range.cc.h"
//#include "multi_array_header.h"
#include "ranges/ranges_header.cc.h"
#include "multi_array_header.h"
namespace MAT = MultiArrayTools;