From 9d7ab24d8ce504959966dedd9c65a5eb6ab442f0 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Tue, 9 Jan 2018 22:38:46 +0100
Subject: [PATCH] adds to last commit

---
 src/multi_array_operation.h  | 13 +++++++++----
 src/pack_num.h               | 21 ++++++++++++++++-----
 src/ranges/container_range.h |  1 +
 src/ranges/multi_range.h     |  1 +
 src/ranges/rpack_num.h       | 16 +++++++++++++++-
 src/ranges/single_range.h    |  1 +
 src/xfor/xfor.h              |  2 +-
 7 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/src/multi_array_operation.h b/src/multi_array_operation.h
index bc4af02..e293f7d 100644
--- a/src/multi_array_operation.h
+++ b/src/multi_array_operation.h
@@ -439,11 +439,16 @@ namespace MultiArrayTools
     {
 #ifdef XX_USE_NEW_LOOP_ROUTINE_XX
 	// === N E W ===
-	AssignmentExpr ae(this, &mSecond);
+	static const size_t TDIM = IndexType::totalDim()
+	typedef std::array<std::intptr_t,TDIM> IAT;
 	typedef decltype(mSecond.rootSteps()) RootStepType;
-	std::array<RootStepType,/*sizeof single indices!!*/>
-	    ee(PackNum</*sizeof single indices!!*/-1>::mkExt(mIndex, mSecond));
-	static auto loop = mIndex->ifor(ee, ae);
+	
+	AssignmentExpr ae(this, &mSecond);
+
+	IAT siar = mIndex->getSIndexTuple();
+	std::array<RootStepType,TDIM> ee;
+	PackNum<TDIM-1>::mkExt(ee, siar, mSecond);
+	auto loop = mIndex->ifor(ee, ae);
 	loop();
 #else
 	// === O L D ===
diff --git a/src/pack_num.h b/src/pack_num.h
index a7dc0db..95c903c 100644
--- a/src/pack_num.h
+++ b/src/pack_num.h
@@ -56,12 +56,15 @@ namespace MultiArrayHelper
 	{
 	    return std::tuple_cat( PackNum<N-1>::mkStepTuple(ii, otp), std::get<N>(otp).rootSteps(ii) );
 	}
-	/*
-	template <class IndexClass, class OpClass>
-	static auto mkExt(const std::shared_ptr<IndexClass>& idxPtr, const OpClass& second)
+	
+	template <class RootStepTuple, class IndexClass, class OpClass>
+	static void mkExt(std::array<RootStepTuple,IndexClass::totalDim()>& out,
+			  const std::array<std::intptr_t,IndexClass::totalDim()>& siar,
+			  const OpClass& second)
 	{
-	// !!!!!
-	}*/
+	    std::get<N>(out) = second.rootSteps( std::get<N>(siar) );
+	    PackNum<N-1>::mkExt(out, siar, second);
+	}
     };
     
     template<>
@@ -108,6 +111,14 @@ namespace MultiArrayHelper
 	    return std::get<0>(otp).rootSteps(ii);
 	}
 
+	template <class RootStepTuple, class IndexClass, class OpClass>
+	static void mkExt(std::array<RootStepTuple,IndexClass::totalDim()>& out,
+			  const std::array<std::intptr_t,IndexClass::totalDim()>& siar,
+			  const OpClass& second)
+	{
+	    std::get<0>(out) = second.rootSteps( std::get<0>(siar) );
+	}
+
     };
 
 
diff --git a/src/ranges/container_range.h b/src/ranges/container_range.h
index e1d38cb..9d1498b 100644
--- a/src/ranges/container_range.h
+++ b/src/ranges/container_range.h
@@ -30,6 +30,7 @@ namespace MultiArrayTools
 
 	static IndexType sType() { return IndexType::CONT; }
 	static size_t sDim() { return sizeof...(Indices); }
+	static size_t totalDim() { return mkTotalDim<Indices...>(); }
 	
     private:
 
diff --git a/src/ranges/multi_range.h b/src/ranges/multi_range.h
index 0b02516..9ca449d 100644
--- a/src/ranges/multi_range.h
+++ b/src/ranges/multi_range.h
@@ -34,6 +34,7 @@ namespace MultiArrayTools
 
 	static IndexType sType() { return IndexType::MULTI; }
 	static size_t sDim() { return sizeof...(Indices); }
+	static size_t totalDim() { return mkTotalDim<Indices...>(); }
 	
     private:
 	
diff --git a/src/ranges/rpack_num.h b/src/ranges/rpack_num.h
index d3af73f..86a9a27 100644
--- a/src/ranges/rpack_num.h
+++ b/src/ranges/rpack_num.h
@@ -10,6 +10,20 @@ namespace MultiArrayHelper
 {
     using namespace MultiArrayTools;
 
+    
+    template <class Index1>
+    size_t mkTotalDim()
+    {
+	return typename Index1::totalDim();
+    }
+    
+    template <class Index1, class Index2, class... Indices>
+    size_t mkTotalDim()
+    {
+	return typename Index1::totalDim() * mkTotalDim<Index2,Indices...>();
+    }
+
+    
     template <size_t N>
     struct RPackNum
     {
@@ -227,7 +241,7 @@ namespace MultiArrayHelper
 	    return std::get<std::tuple_size<IndexPack>::value-N>(ipack)
 		->ifor( ext, RPackNum<N-1>::mkFor(ipack, ext, exs) );
 	}
-	
+
     };
 
     
diff --git a/src/ranges/single_range.h b/src/ranges/single_range.h
index b453c4c..186b9a3 100644
--- a/src/ranges/single_range.h
+++ b/src/ranges/single_range.h
@@ -32,6 +32,7 @@ namespace MultiArrayTools
 	SingleIndex(const std::shared_ptr<SingleRange<U,TYPE> >& range);
 
 	static IndexType sType() { return IndexType::SINGLE; }
+	static size_t totalDim() { return 1; }
 	
 	// ==== >>>>> STATIC POLYMORPHISM <<<<< ====
 	
diff --git a/src/xfor/xfor.h b/src/xfor/xfor.h
index 26ffda3..fb90c29 100644
--- a/src/xfor/xfor.h
+++ b/src/xfor/xfor.h
@@ -80,7 +80,7 @@ namespace MultiArrayHelper
 				     std::tuple<to_size_t<Ops>...>&& ext,
 				     const Args&... args) :
 	mIndPtr(indPtr), mExpr(args...), mExt(ext) {}
-
+    
     template <class IndexClass, class Expr, class... Ops>
     For<IndexClass,Expr,Ops...>::For(IndexClass* indPtr,
 				     Expr&& expr, std::tuple<to_size_t<Ops>...>&& ext) :