From be016abf3a263ed02b22a041b669a437ad94e896 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Sat, 6 Oct 2018 13:14:24 +0200
Subject: [PATCH] final at [] + assignment between Container Indices of
 different data type

---
 src/include/multi_array.h            |  4 ++--
 src/include/multi_array_base.h       | 27 +++++++++++++++++++++++++++
 src/include/ranges/container_range.h | 20 +++++++++++++++++++-
 src/include/slice.h                  |  6 +++---
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/include/multi_array.h b/src/include/multi_array.h
index 63a2309..6ab76db 100644
--- a/src/include/multi_array.h
+++ b/src/include/multi_array.h
@@ -56,8 +56,8 @@ namespace MultiArrayTools
 	//template <class Range2, class Range3>
 	//MultiArray& operator=(const MultiArray<MultiArray<T,Range2>,Range3> in);
 	
-	virtual T& operator[](const IndexType& i) override;
-	virtual const T& operator[](const IndexType& i) const override;
+	virtual T& operator[](const IndexType& i) final;
+	virtual const T& operator[](const IndexType& i) const final;
 	virtual T& at(const typename IndexType::MetaType& meta) override;
 	virtual const T& at(const typename IndexType::MetaType& meta) const override;
 	
diff --git a/src/include/multi_array_base.h b/src/include/multi_array_base.h
index 73312f7..a01343d 100644
--- a/src/include/multi_array_base.h
+++ b/src/include/multi_array_base.h
@@ -39,6 +39,9 @@ namespace MultiArrayTools
 
 	virtual ~MultiArrayBase() = default;
 
+	template <typename X>
+	const T& operator[](const ContainerIndex<X,typename SRanges::IndexType...>& i);
+	
 	virtual const T& operator[](const IndexType& i) const = 0;
 	virtual const T& at(const typename CRange::IndexType::MetaType& meta) const = 0;
 
@@ -95,6 +98,9 @@ namespace MultiArrayTools
 	DEFAULT_MEMBERS(MutableMultiArrayBase);
 	MutableMultiArrayBase(const std::shared_ptr<SRanges>&... ranges);
 	MutableMultiArrayBase(const typename CRange::Space& space);
+
+	template <typename X>
+	T& operator[](const ContainerIndex<X,typename SRanges::IndexType...>& i);
 	
 	virtual T& operator[](const IndexType& i) = 0;
 	virtual T& at(const typename CRange::IndexType::MetaType& meta) = 0;
@@ -158,6 +164,16 @@ namespace MultiArrayTools
 	mRange = std::dynamic_pointer_cast<ContainerRange<T,SRanges...> >( crf.create() );
 	mProtoI = std::make_shared<IndexType>( mRange, reinterpret_cast<std::intptr_t>(this) );
     }
+
+    template <typename T, class... SRanges>
+    template <typename X>
+    const T& MultiArrayBase<T,SRanges...>::operator[](const ContainerIndex<X,typename SRanges::IndexType...>& i)
+    {
+	IndexType ii(*mProtoI);
+	ii = i;
+	return (*this)[ii];
+    }
+
     
     template <typename T, class... SRanges>
     size_t MultiArrayBase<T,SRanges...>::size() const
@@ -279,6 +295,17 @@ namespace MultiArrayTools
 	return i.setData(data());
     }
     */
+
+    template <typename T, class... SRanges>
+    template <typename X>
+    T& MutableMultiArrayBase<T,SRanges...>::operator[](const ContainerIndex<X,typename SRanges::IndexType...>& i)
+    {
+	IndexType ii(*MAB::mProtoI);
+	ii = i;
+	return (*this)[ii];
+    }
+
+    
     template <typename T, class... SRanges>
     bool MutableMultiArrayBase<T,SRanges...>::isConst() const
     {
diff --git a/src/include/ranges/container_range.h b/src/include/ranges/container_range.h
index 6ab5a8f..090d873 100644
--- a/src/include/ranges/container_range.h
+++ b/src/include/ranges/container_range.h
@@ -33,6 +33,12 @@ namespace MultiArrayTools
 	static constexpr size_t totalDim() { return mkTotalDim<Indices...>(); }
 
 	static constexpr SpaceType STYPE = SpaceType::ANY;
+
+	template <typename X>
+	using CIX = ContainerIndex<X,Indices...>;
+	
+	template <typename X>
+	friend class CIX;
 	
     private:
 	
@@ -50,6 +56,9 @@ namespace MultiArrayTools
 
 	ContainerIndex(const ContainerIndex& in) = default;
 	ContainerIndex& operator=(const ContainerIndex& in) = default;
+
+	template <typename X>
+	ContainerIndex& operator=(const ContainerIndex<X,Indices...>& in);
 	
 	template <class MRange>
 	ContainerIndex(const std::shared_ptr<MRange>& range,
@@ -251,7 +260,16 @@ namespace MultiArrayTools
 	IB::mPos = RPackNum<sizeof...(Indices)-1>::makePos(mIPack, mBlockSizes);
 	mNonTrivialBlocks = true;
     }
-    
+
+    template <typename T, class... Indices>
+    template <typename X>
+    ContainerIndex<T,Indices...>&
+    ContainerIndex<T,Indices...>::operator=(const ContainerIndex<X,Indices...>& in)
+    {
+	mIPack = in.mIPack;
+	return (*this)();
+    }
+
     
     template <typename T, class... Indices>
     ContainerIndex<T,Indices...>& ContainerIndex<T,Indices...>::sync()
diff --git a/src/include/slice.h b/src/include/slice.h
index 12e4ee5..2937fa4 100644
--- a/src/include/slice.h
+++ b/src/include/slice.h
@@ -23,7 +23,7 @@ namespace MultiArrayTools
 	ConstSlice(const std::shared_ptr<SRanges>&... ranges, const T* data = nullptr);
 	ConstSlice(const MultiArrayBase<T,AnonymousRange>& ma, SIZET<SRanges>... sizes);
 	
-	virtual const T& operator[](const IType& i) const override;
+	virtual const T& operator[](const IType& i) const final;
 	virtual const T& at(const typename IType::MetaType& meta) const override;
 	
 	virtual const T* data() const override;
@@ -63,8 +63,8 @@ namespace MultiArrayTools
 
 	Slice(const std::shared_ptr<SRanges>&... ranges, T* data = nullptr);
 	    
-	virtual const T& operator[](const IType& i) const override;
-	virtual T& operator[](const IType& i) override;
+	virtual const T& operator[](const IType& i) const final;
+	virtual T& operator[](const IType& i) final;
 	virtual const T& at(const typename IType::MetaType& meta) const override;
 	virtual T& at(const typename IType::MetaType& meta) override;