From 1d882d55c405eaed2c2c71fb5bdd0fec7217258f Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Fri, 28 May 2021 19:48:27 +0200
Subject: [PATCH] ContainerRange typedef: remove template arg T + remove
 MultiRange Factory constructor for ContainerRange

---
 src/include/functional_multi_array.h    |  2 +-
 src/include/multi_array.h               |  2 +-
 src/include/multi_array_base.cc.h       |  8 ++++----
 src/include/multi_array_base.h          |  4 ++--
 src/include/multi_array_operation.h     |  8 ++++----
 src/include/ranges/container_range.h    |  2 +-
 src/include/ranges/multi_range.h        |  8 +++++---
 src/include/ranges/rbase_def.h          | 11 ++---------
 src/include/slice.h                     |  4 ++--
 src/tests/ranges/anonymous_unit_test.cc |  2 +-
 src/tests/ranges/index_unit_test.cc     |  2 +-
 11 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/include/functional_multi_array.h b/src/include/functional_multi_array.h
index 14509fd..b2a8251 100644
--- a/src/include/functional_multi_array.h
+++ b/src/include/functional_multi_array.h
@@ -79,7 +79,7 @@ namespace MultiArrayTools
     {
     public:
 
-	typedef ContainerRange<T,SRanges...> CRange;
+	typedef ContainerRange<SRanges...> CRange;
 	typedef MultiArrayBase<T,SRanges...> MAB;
 	typedef ConstContainerIndex<T,typename SRanges::IndexType...> IndexType;
 	typedef MultiArray<T,SRanges...> MAType;
diff --git a/src/include/multi_array.h b/src/include/multi_array.h
index 0481924..4fba5e9 100644
--- a/src/include/multi_array.h
+++ b/src/include/multi_array.h
@@ -30,7 +30,7 @@ namespace MultiArrayTools
     {
     public:
 
-	typedef ContainerRange<T,SRanges...> CRange;
+	typedef ContainerRange<SRanges...> CRange;
 	typedef MultiArrayBase<T,SRanges...> MAB;
 	typedef ConstContainerIndex<T,typename SRanges::IndexType...> IndexType;
 	
diff --git a/src/include/multi_array_base.cc.h b/src/include/multi_array_base.cc.h
index 3a8c4a6..80b4273 100644
--- a/src/include/multi_array_base.cc.h
+++ b/src/include/multi_array_base.cc.h
@@ -54,16 +54,16 @@ namespace MultiArrayTools
     template <typename T, class... SRanges>
     MultiArrayBase<T,SRanges...>::MultiArrayBase(const std::shared_ptr<SRanges>&... ranges)
     {
-	ContainerRangeFactory<T,SRanges...> crf(ranges...);
-	mRange = std::dynamic_pointer_cast<ContainerRange<T,SRanges...> >( crf.create() );
+	ContainerRangeFactory<SRanges...> crf(ranges...);
+	mRange = std::dynamic_pointer_cast<ContainerRange<SRanges...> >( crf.create() );
 	mProtoI = std::make_shared<IndexType>( mRange, reinterpret_cast<std::intptr_t>(this) );
     }
 
     template <typename T, class... SRanges>
     MultiArrayBase<T,SRanges...>::MultiArrayBase(const typename CRange::Space& space)
     {
-	ContainerRangeFactory<T,SRanges...> crf(space);
-	mRange = std::dynamic_pointer_cast<ContainerRange<T,SRanges...> >( crf.create() );
+	ContainerRangeFactory<SRanges...> crf(space);
+	mRange = std::dynamic_pointer_cast<ContainerRange<SRanges...> >( crf.create() );
 	mProtoI = std::make_shared<IndexType>( mRange, reinterpret_cast<std::intptr_t>(this) );
     }
 
diff --git a/src/include/multi_array_base.h b/src/include/multi_array_base.h
index 075d069..2e27abe 100644
--- a/src/include/multi_array_base.h
+++ b/src/include/multi_array_base.h
@@ -56,7 +56,7 @@ namespace MultiArrayTools
     public:
 
 	typedef T value_type;
-	typedef ContainerRange<T,SRanges...> CRange;
+	typedef ContainerRange<SRanges...> CRange;
 	typedef ConstContainerIndex<T,typename SRanges::IndexType...> IndexType;
 
     protected:
@@ -125,7 +125,7 @@ namespace MultiArrayTools
     {
     public:
 
-	typedef ContainerRange<T,SRanges...> CRange;
+	typedef ContainerRange<SRanges...> CRange;
 	typedef MultiArrayBase<T,SRanges...> MAB;
 	typedef ConstContainerIndex<T,typename SRanges::IndexType...> IndexType;
 	
diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h
index 01e3d48..f3e32b2 100644
--- a/src/include/multi_array_operation.h
+++ b/src/include/multi_array_operation.h
@@ -410,7 +410,7 @@ namespace MultiArrayTools
 
 	typedef T value_type;
 	typedef OperationBase<T,ConstOperationRoot<T,Ranges...> > OT;
-	typedef ContainerRange<T,Ranges...> CRange;
+	typedef ContainerRange<Ranges...> CRange;
 	typedef ConstContainerIndex<T,typename Ranges::IndexType...> IndexType;
 
 	static constexpr size_t SIZE = 1;
@@ -534,7 +534,7 @@ namespace MultiArrayTools
 
 	typedef T value_type;
 	typedef OperationBase<T,OperationRoot<T,Ranges...> > OT;
-	typedef ContainerRange<T,Ranges...> CRange;
+	typedef ContainerRange<Ranges...> CRange;
 	typedef ConstContainerIndex<T,typename Ranges::IndexType...> IndexType;
 
 	static constexpr size_t SIZE = 1;
@@ -629,7 +629,7 @@ namespace MultiArrayTools
 
 	typedef T value_type;
 	typedef OperationBase<T,ParallelOperationRoot<T,Ranges...> > OT;
-	typedef ContainerRange<T,Ranges...> CRange;
+	typedef ContainerRange<Ranges...> CRange;
 	typedef ConstContainerIndex<T,typename Ranges::IndexType...> IndexType;
 
 	static constexpr size_t SIZE = 1;
@@ -714,7 +714,7 @@ namespace MultiArrayTools
     public:
 	typedef T value_type;
 	typedef OperationBase<T,OperationValue<T> > OT;
-	typedef ContainerRange<T,NullRange> CRange;
+	typedef ContainerRange<NullRange> CRange;
 	typedef ConstContainerIndex<T,NullIndex> IndexType;
 
 	static constexpr size_t SIZE = 0;
diff --git a/src/include/ranges/container_range.h b/src/include/ranges/container_range.h
index c7f521b..3a81a4b 100644
--- a/src/include/ranges/container_range.h
+++ b/src/include/ranges/container_range.h
@@ -24,7 +24,7 @@ namespace MultiArrayTools
 			       std::tuple<typename Indices::MetaType...> > IB;
 	typedef std::tuple<typename Indices::MetaType...>  MetaType;
 	typedef std::tuple<std::shared_ptr<Indices>...> IndexPack;
-	typedef ContainerRange<T,typename Indices::RangeType...> RangeType;
+	typedef ContainerRange<typename Indices::RangeType...> RangeType;
 
 	static constexpr IndexType sType() { return IndexType::CONT; }
 	static constexpr size_t sDim() { return sizeof...(Indices); }
diff --git a/src/include/ranges/multi_range.h b/src/include/ranges/multi_range.h
index 929b924..c9d81af 100644
--- a/src/include/ranges/multi_range.h
+++ b/src/include/ranges/multi_range.h
@@ -140,8 +140,8 @@ namespace MultiArrayTools
 	MultiRangeFactory(const std::shared_ptr<Ranges>&... rs);
 	MultiRangeFactory(const typename MultiRange<Ranges...>::Space& space);
 
-	template <typename T>
-	MultiRangeFactory(const std::shared_ptr<ContainerRange<T,Ranges...> >& cr);
+	//template <typename T>
+	//MultiRangeFactory(const std::shared_ptr<ContainerRange<Ranges...> >& cr);
 	
 	virtual std::shared_ptr<RangeBase> create() override;
 
@@ -504,12 +504,14 @@ namespace MultiArrayTools
 	mProd = std::shared_ptr< MultiRange<Ranges...> >( new MultiRange<Ranges...>( st ) );
     }
 
+    /*
     template <class... Ranges>
     template <typename T>
-    MultiRangeFactory<Ranges...>::MultiRangeFactory(const std::shared_ptr<ContainerRange<T,Ranges...> >& cr)
+    MultiRangeFactory<Ranges...>::MultiRangeFactory(const std::shared_ptr<ContainerRange<Ranges...> >& cr)
     {
 	mProd = std::shared_ptr< MultiRange<Ranges...> >( new MultiRange<Ranges...>( cr->space() ) );
     }
+    */
     
     template <class... Ranges>
     std::shared_ptr<RangeBase> MultiRangeFactory<Ranges...>::create()
diff --git a/src/include/ranges/rbase_def.h b/src/include/ranges/rbase_def.h
index e94bc59..a30891c 100644
--- a/src/include/ranges/rbase_def.h
+++ b/src/include/ranges/rbase_def.h
@@ -81,15 +81,11 @@ namespace MultiArrayTools
     class MultiIndex;
 
     // container_range.h
-    //template <typename T, class... Ranges>
-    //class ContainerRangeFactory;
-    template <typename T, class... Ranges>
+    template <class... Ranges>
     using ContainerRangeFactory = MultiRangeFactory<Ranges...>;
 
     // container_range.h
-    //template <typename T, class... Ranges>
-    //class ContainerRange;
-    template <typename T, class... Ranges>
+    template <class... Ranges>
     using ContainerRange = MultiRange<Ranges...>;
     
     // container_range.h
@@ -99,9 +95,6 @@ namespace MultiArrayTools
     // anonymous_range.h
     class AnonymousRangeFactory;
 
-    // anonymous_range.h
-    //class AnonymousRange;
-
     // dynamic_range.h
     class IndexWrapperBase;
 
diff --git a/src/include/slice.h b/src/include/slice.h
index dc28d70..70c1af3 100644
--- a/src/include/slice.h
+++ b/src/include/slice.h
@@ -12,7 +12,7 @@ namespace MultiArrayTools
     {
     public:
 
-	typedef ContainerRange<T,SRanges...> CRange;
+	typedef ContainerRange<SRanges...> CRange;
 	typedef MultiArrayBase<T,SRanges...> MAB;
 	typedef ConstContainerIndex<T,typename SRanges::IndexType...> IType;
 
@@ -55,7 +55,7 @@ namespace MultiArrayTools
     {
     public:
 
-	typedef ContainerRange<T,SRanges...> CRange;
+	typedef ContainerRange<SRanges...> CRange;
 	typedef MultiArrayBase<T,SRanges...> MAB;
 	typedef ConstContainerIndex<T,typename SRanges::IndexType...> IType;
 
diff --git a/src/tests/ranges/anonymous_unit_test.cc b/src/tests/ranges/anonymous_unit_test.cc
index b8b91ef..c2e6815 100644
--- a/src/tests/ranges/anonymous_unit_test.cc
+++ b/src/tests/ranges/anonymous_unit_test.cc
@@ -50,7 +50,7 @@ namespace {
 	typedef MultiRangeFactory<SRange,M3Range,SRange> MasterRF;
 	typedef MasterRF::oType MasterRange;
 
-	typedef ContainerRangeFactory<double,M3Range,SRange> CRF;
+	typedef ContainerRangeFactory<M3Range,SRange> CRF;
 	typedef CRF::oType CRange;
 	typedef ConstContainerIndex<double,M3Range::IndexType,SRange::IndexType> CIndex;
 
diff --git a/src/tests/ranges/index_unit_test.cc b/src/tests/ranges/index_unit_test.cc
index f4e6004..f9d81b5 100644
--- a/src/tests/ranges/index_unit_test.cc
+++ b/src/tests/ranges/index_unit_test.cc
@@ -88,7 +88,7 @@ namespace {
 	typedef MultiRangeFactory<SRange,M3Range,SRange> MasterRF;
 	typedef MasterRF::oType MasterRange;
 
-	typedef ContainerRangeFactory<double,M3Range,SRange> CRF;
+	typedef ContainerRangeFactory<M3Range,SRange> CRF;
 	typedef CRF::oType CRange;
 	typedef ConstContainerIndex<double,M3Range::IndexType,SRange::IndexType> CIndex;