From 1b251e58676572042bfc7f4e7f93165c2b07e13e Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Thu, 7 Dec 2017 18:11:24 +0100
Subject: [PATCH] anonymous range should be complete now (still UNTESTED)

---
 src/anonymous_range.h    | 43 +++++++++++++++++++++++++++++++---------
 src/base_def.h           |  6 ++++++
 src/op_unit_test.cc      |  6 ++++--
 src/pack_num.h           | 15 ++++++++++----
 src/range_types/header.h |  9 +++++++++
 5 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/src/anonymous_range.h b/src/anonymous_range.h
index 5bd4953..5b87367 100644
--- a/src/anonymous_range.h
+++ b/src/anonymous_range.h
@@ -19,7 +19,13 @@ namespace MultiArrayTools
 	typedef AnonymousRange oType;
 
 	AnonymousRangeFactory() = delete;
-	AnonymousRangeFactory(const std::shared_ptr<Ranges>... origs);
+
+	template <class... Ranges>
+	AnonymousRangeFactory(const std::tuple<std::shared_ptr<Ranges>...>& origs);
+	
+	template <class... Ranges>
+	AnonymousRangeFactory(std::shared_ptr<Ranges>... origs);
+
 	std::shared_ptr<RangeBase> create();
 	
     };
@@ -48,7 +54,10 @@ namespace MultiArrayTools
 	AnonymousRange(const AnonymousRange& in) = delete;
 
 	template <class Ranges...>
-	AnonymousRange(const std::shared_ptr<Ranges>... origs);
+	AnonymousRange(const std::tuple<std::shared_ptr<Ranges>...>& origs)
+	
+	template <class Ranges...>
+	AnonymousRange(std::shared_ptr<Ranges>... origs);
 
 	size_t mSize;
 	
@@ -67,10 +76,17 @@ namespace MultiArrayTools
     /***********************
      *   AnonymousRange    *
      ***********************/
-    
-    AnonymousRangeFactory::AnonymousRangeFactory(const std::shared_ptr<Ranges>... origs)
+
+    template <class... Ranges>
+    AnonymousRangeFactory::AnonymousRangeFactory(const std::tuple<std::shared_ptr<Ranges>...>& origs)
     {
-	mProd = std::shared_ptr<oType>( new AnonymousRange( space ) );
+	mProd = std::shared_ptr<oType>( new AnonymousRange( origs ) );
+    }
+
+    template <class... Ranges>
+    AnonymousRangeFactory::AnonymousRangeFactory(std::shared_ptr<Ranges>... origs)
+    {
+	mProd = std::shared_ptr<oType>( new AnonymousRange( origs... ) );
     }
         
     std::shared_ptr<RangeBase> AnonymousRangeFactory::create()
@@ -84,13 +100,22 @@ namespace MultiArrayTools
      ***********************/
 
     template <class... Ranges>
-    AnonymousRange::AnonymousRange(const std::shared_ptr<Ranges>... origs) :
+    AnonymousRange::AnonymousRange(const std::tuple<std::shared_ptr<Ranges>...>& origs) :
 	RangeInterface<AnonymousIndex>()
     {
 	mOrig.resize(sizeof...(Ranges));
-	PackNum<sizeof...(Ranges)-1>::RangesToVec();
-	// mOrig !!!!
-	// mSize !!! = (prod origs.size...)
+	PackNum<sizeof...(Ranges)-1>::RangesToVec( origs, mOrig );
+	PackNum<sizeof...(Ranges)-1>::getSize( rst );
+    }
+    
+    template <class... Ranges>
+    AnonymousRange::AnonymousRange(std::shared_ptr<Ranges>... origs) :
+	RangeInterface<AnonymousIndex>()
+    {
+	auto rst = std::make_tuple(origs...);
+	mOrig.resize(sizeof...(Ranges));
+	PackNum<sizeof...(Ranges)-1>::RangesToVec( rst, mOrig );
+	PackNum<sizeof...(Ranges)-1>::getSize( rst );
     }
     
     size_t AnonymousRange::get(size_t pos) const
diff --git a/src/base_def.h b/src/base_def.h
index f181565..ca81680 100644
--- a/src/base_def.h
+++ b/src/base_def.h
@@ -106,6 +106,12 @@ namespace MultiArrayTools
     template <class... Indices>
     class ContainerIndex;
 
+    // anonymous_range.h
+    class AnonymousRangeFactory;
+
+    // anonymous_range.h
+    class AnonymousRange;
+    
     // multi_array.h
     template <typename T, class... SRanges>
     class MultiArrayBase;
diff --git a/src/op_unit_test.cc b/src/op_unit_test.cc
index df261e1..7d78bb6 100644
--- a/src/op_unit_test.cc
+++ b/src/op_unit_test.cc
@@ -151,8 +151,10 @@ namespace {
 	    mrptr = std::dynamic_pointer_cast<MRange>(rfbptr->create());
 	}
 
-	const size_t vs1 = 10000;
-	const size_t vs2 = 1000;	
+	//const size_t vs1 = 10000;
+	//const size_t vs2 = 1000;
+	const size_t vs1 = 4000;
+	const size_t vs2 = 2500;
 
 	std::shared_ptr<RangeFactoryBase> rfbptr;
 	std::shared_ptr<SRange> sr1ptr;
diff --git a/src/pack_num.h b/src/pack_num.h
index e6de26c..9fa0fb7 100644
--- a/src/pack_num.h
+++ b/src/pack_num.h
@@ -245,12 +245,12 @@ namespace MultiArrayHelper
 	    PackNum<N-1>::printTuple(out, tp);
 	}
 
-	template <class RangeType, class... Ranges>
-	static void RangesToVec(const std::shared_ptr<RangeType> r,
-				const std::shared_ptr<Ranges>... rs,
+	template <class... Ranges>
+	static void RangesToVec(const std::tuple<std::shared_ptr<Ranges>...>& rst,
 				std::vector<RangeBase> v)
 	{
-	    
+	    v[N] = std::get<N>(rst);
+	    PackNum<N>::RangesToVec(rst, v);
 	}
     };
     
@@ -433,6 +433,13 @@ namespace MultiArrayHelper
 	    out << std::get<sizeof...(T)-1>(tp);
 	}
 
+	template <class... Ranges>
+	static void RangesToVec(const std::tuple<std::shared_ptr<Ranges>...>& rst,
+				std::vector<RangeBase> v)
+	{
+	    v[0] = std::get<0>(rst);
+	}
+
     };
 
     template <typename... T>
diff --git a/src/range_types/header.h b/src/range_types/header.h
index d551506..6826c94 100644
--- a/src/range_types/header.h
+++ b/src/range_types/header.h
@@ -1,7 +1,14 @@
 
+#ifdef include_range_type
+#define __incl_this__
+#endif
 #ifdef __single_range_h__
 // singel_range is template which is specialized here
 // therefore it must be defined before...
+#define __incl_this__
+#endif
+
+#ifdef __incl_this__
 
 #ifndef __ranges_header__
 #define __ranges_header__
@@ -10,3 +17,5 @@
 
 #endif
 #endif
+
+#undef __incl_this__