From 91acb873e1bf7195d947ad82d6bd396ec04388a0 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Sat, 8 Sep 2018 18:46:04 +0200
Subject: [PATCH] small adjustments

---
 src/include/multi_array_base.h       | 32 +++++++++++++++++++++++++++-
 src/include/ranges/container_range.h | 16 ++++++++++++++
 src/include/slice.h                  | 20 +++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/include/multi_array_base.h b/src/include/multi_array_base.h
index 684dc27..73312f7 100644
--- a/src/include/multi_array_base.h
+++ b/src/include/multi_array_base.h
@@ -58,6 +58,9 @@ namespace MultiArrayTools
 	virtual bool isConst() const;
 
 	virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymous(bool slice = false) const = 0;
+
+	virtual ConstOperationRoot<T,SRanges...>
+	op(const std::shared_ptr<IndexType>& ind) const;
 	
 	virtual ConstOperationRoot<T,SRanges...>
 	operator()(const std::shared_ptr<typename SRanges::IndexType>&... inds) const;
@@ -105,9 +108,15 @@ namespace MultiArrayTools
 
 	virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymousMove() = 0;
 	
+	virtual ConstOperationRoot<T,SRanges...>
+	op(const std::shared_ptr<IndexType>& ind) const override;
+
 	virtual ConstOperationRoot<T,SRanges...>
 	operator()(const std::shared_ptr<typename SRanges::IndexType>&... inds) const override;
-	
+
+	virtual OperationRoot<T,SRanges...>
+	op(const std::shared_ptr<IndexType>& ind);
+
 	virtual OperationRoot<T,SRanges...> operator()(const std::shared_ptr<typename SRanges::IndexType>&... inds);
 
 	template <class... MappedRanges>
@@ -212,6 +221,13 @@ namespace MultiArrayTools
 	return ConstOperationRoot<T,SRanges...>(*this, inds...);
     }
 
+    template <typename T, class... SRanges>
+    ConstOperationRoot<T,SRanges...>
+    MultiArrayBase<T,SRanges...>::op(const std::shared_ptr<IndexType>& ind) const
+    {
+	return ConstOperationRoot<T,SRanges...>(data(), *ind);
+    }
+
     template <typename T, class... SRanges>
     template <class... MappedRanges>
     ConstOperationRoot<T,MappedRanges...>
@@ -275,6 +291,13 @@ namespace MultiArrayTools
     {
 	return OperationRoot<T,SRanges...>(*this, inds...);
     }
+
+    template <typename T, class... SRanges>
+    OperationRoot<T,SRanges...>
+    MutableMultiArrayBase<T,SRanges...>::op(const std::shared_ptr<IndexType>& ind)
+    {
+	return OperationRoot<T,SRanges...>(data(), *ind);
+    }
     
     template <typename T, class... SRanges>
     ConstOperationRoot<T,SRanges...>
@@ -283,6 +306,13 @@ namespace MultiArrayTools
 	return ConstOperationRoot<T,SRanges...>(*this, inds...);
     }
 
+    template <typename T, class... SRanges>
+    ConstOperationRoot<T,SRanges...>
+    MutableMultiArrayBase<T,SRanges...>::op(const std::shared_ptr<IndexType>& ind) const
+    {
+	return ConstOperationRoot<T,SRanges...>(data(), *ind);
+    }
+
     template <typename T, class... SRanges>
     template <class... MappedRanges>
     OperationRoot<T,MappedRanges...>
diff --git a/src/include/ranges/container_range.h b/src/include/ranges/container_range.h
index f55983f..a7d6e4f 100644
--- a/src/include/ranges/container_range.h
+++ b/src/include/ranges/container_range.h
@@ -120,6 +120,8 @@ namespace MultiArrayTools
 	
 	const T& operator*() const;
 	const T* operator->() const;
+	//T& operator*();
+	//T* operator->();
 
 	ContainerIndex operator++(int);
 	ContainerIndex operator--(int);
@@ -476,7 +478,21 @@ namespace MultiArrayTools
 	//return &mMa[*this];
 	return &mData[IB::mPos];
     }
+    /*
+    template <typename T, class... Indices>
+    T& ContainerIndex<T,Indices...>::operator*()
+    {
+	//return mMa[*this];
+	return mData[IB::mPos];
+    }
 
+    template <typename T, class... Indices>
+    T* ContainerIndex<T,Indices...>::operator->()
+    {
+	//return &mMa[*this];
+	return &mData[IB::mPos];
+    }
+    */
     template <typename T, class... Indices>
     ContainerIndex<T,Indices...> ContainerIndex<T,Indices...>::operator++(int)
     {
diff --git a/src/include/slice.h b/src/include/slice.h
index 9e0fd58..e520e7c 100644
--- a/src/include/slice.h
+++ b/src/include/slice.h
@@ -91,6 +91,19 @@ namespace MultiArrayTools
     {
     public:
 	typedef ContainerIndex<T,typename SRanges::IndexType...> IType;
+
+	template <class Op>
+	static ConstSlice<T,SRanges...> mkSlice( const typename ConstSlice<T,SRanges...>::IndexType& ind,
+						 const Op& op )
+	{
+	    ConstSlice<T,SRanges...> out(ind->range()->space(), &*ind);
+	    std::array<size_t,sizeof...(SRanges)+1> ff;
+	    for(size_t i = 0; i != sizeof...(SRanges)+1; ++i){
+		PackNum<sizeof...(SRanges)-1>::mkSliceBlocks(ff, ind, op);
+	    }
+	    out.format(ff);
+	    return out;
+	}
 	
     private:
 	IType mIndex;
@@ -108,6 +121,13 @@ namespace MultiArrayTools
 	template <class... ORanges>
 	SliceDef& operator=(const OperationRoot<T,ORanges...>& op);
     };
+
+    template <typename T, class Op, class... Ranges>
+    ConstSlice<T,Ranges...> mkSlice( const typename ConstSlice<T,Ranges...>::IndexType& ind,
+				     const Op& op )
+    {
+	return SliceDef<T,Ranges...>::mkSlice(ind, op);
+    }
     
 } // end namespace MultiArrayTools