From 312074c486f6bb42302a63df16a13bdbac30a9c1 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Thu, 1 Jul 2021 00:42:31 +0200
Subject: [PATCH] multi_array_operation: remove RootSumN

---
 src/include/multi_array_operation.cc.h | 33 +++++++++++--
 src/include/multi_array_operation.h    | 64 +-------------------------
 2 files changed, 32 insertions(+), 65 deletions(-)

diff --git a/src/include/multi_array_operation.cc.h b/src/include/multi_array_operation.cc.h
index 956e702..e3b8161 100644
--- a/src/include/multi_array_operation.cc.h
+++ b/src/include/multi_array_operation.cc.h
@@ -134,7 +134,8 @@ namespace MultiArrayTools
     {
 	return OperationPointer<T,OperationClass>(THIS());
     }
-
+    
+    /*
     template <typename T, class OperationClass>
     template <class... Indices>
     auto OperationBase<T,OperationClass>::ho(const std::shared_ptr<Indices>& inds...) const
@@ -142,6 +143,7 @@ namespace MultiArrayTools
         typedef XX SubOp;
 	return HyperOperation<T,SubOp,Indices...>()
     }
+    */
     
     /************************
      *   AssignmentExpr     *
@@ -208,16 +210,41 @@ namespace MultiArrayTools
 	static_assert(SIZE == sizeof...(Ops), "size missmatch");
     }
 
+    template <size_t N, class ExtType, class... Exprs>
+    inline size_t MOpGetX( ExtType last, const std::tuple<Exprs...>& etp)
+    {
+	if constexpr(N > 0){
+	    std::get<sizeof...(Exprs)-N-1>(etp).get(last);
+	    return MOpGetX<N-1>(last.next(),etp);
+	}
+	else {
+	    std::get<sizeof...(Exprs)-1>(etp).get(last);
+	    return 0;
+	}
+    }
+
+    template <size_t N, class ExtType, class... Exprs>
+    inline void MOpSetX( ExtType last, std::tuple<Exprs...>& etp)
+    {
+	if constexpr(N > 0){
+	    std::get<sizeof...(Exprs)-N-1>(etp).set(last);
+	    MOpSetX<N-1>(last.next(),etp);
+	}
+	else {
+	    std::get<sizeof...(Exprs)-1>(etp).set(last);
+	}
+    }
+
     template <typename T, class... Ops>
     inline size_t MOp<T,Ops...>::get(ExtType last) const
     {
-	return RootSumN<sizeof...(Ops)-1>::get(last,mOps.mOps);
+	return MOpGetX<sizeof...(Ops)-1>(last,mOps.mOps);
     }
 
     template <typename T, class... Ops>
     inline MOp<T,Ops...>& MOp<T,Ops...>::set(ExtType last)
     {
-	RootSumN<sizeof...(Ops)-1>::set(last,mOps.mOps);
+	MOpSetX<sizeof...(Ops)-1>(last,mOps.mOps);
 	return *this;
     }
     
diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h
index 7ed20ef..01126f6 100644
--- a/src/include/multi_array_operation.h
+++ b/src/include/multi_array_operation.h
@@ -99,68 +99,6 @@ namespace MultiArrayTools
 	friend OperationClass;
     };
 
-    template <size_t N>
-    struct RootSumN
-    {
-
-	template <class... Exprs>
-	static inline auto rootSteps(const std::tuple<Exprs...>& etp, std::intptr_t i)
-	{
-	    return RootSumN<N-1>::rootSteps(etp,i).extend( std::get<N>(etp).rootSteps(i) );
-	}
-
-	template <class ExtType, class... Exprs>
-	static inline void exec( size_t start, ExtType last, std::tuple<Exprs...>& etp)
-	{
-	    std::get<sizeof...(Exprs)-N-1>(etp)(start,last);
-	    RootSumN<N-1>::exec(start,last.next(),etp);
-	}
-
-	template <class ExtType, class... Exprs>
-	static inline size_t get( ExtType last, const std::tuple<Exprs...>& etp)
-	{
-	    std::get<sizeof...(Exprs)-N-1>(etp).get(last);
-	    return RootSumN<N-1>::get(last.next(),etp);
-	}
-
-	template <class ExtType, class... Exprs>
-	static inline void set( ExtType last, std::tuple<Exprs...>& etp)
-	{
-	    std::get<sizeof...(Exprs)-N-1>(etp).set(last);
-	    RootSumN<N-1>::set(last.next(),etp);
-	}
-    };
-
-    template <>
-    struct RootSumN<0>
-    {
-
-	template <class... Exprs>
-	static inline auto rootSteps(const std::tuple<Exprs...>& etp, std::intptr_t i)
-	{
-	    return std::get<0>(etp).rootSteps(i);
-	}
-
-	template <class ExtType, class... Exprs>
-	static inline void exec( size_t start, ExtType last, std::tuple<Exprs...>& etp)
-	{
-	    std::get<sizeof...(Exprs)-1>(etp)(start,last);
-	}
-
-	template <class ExtType, class... Exprs>
-	static inline size_t get( ExtType last, const std::tuple<Exprs...>& etp)
-	{
-	    std::get<sizeof...(Exprs)-1>(etp).get(last);
-	    return 0;
-	}
-
-	template <class ExtType, class... Exprs>
-	static inline void set( ExtType last, std::tuple<Exprs...>& etp)
-	{
-	    std::get<sizeof...(Exprs)-1>(etp).set(last);
-	}
-    };
-
     
     template <typename T>
     struct SelfIdentity
@@ -875,6 +813,7 @@ namespace MultiArrayTools
     };
 
     // for SliceArray
+    /*
     template <typename T, class Op>
     class HyperOperation : public OperationTemplate<T,HyperOperation<T,Op> >
     {
@@ -915,6 +854,7 @@ namespace MultiArrayTools
 	auto loop(Expr exp) const
 	    -> decltype(mInd->iforh(1,mOp.loop(exp)));
     };
+    */
 }