From aceffc1af615065da40f28f84db4e2bb10ba1a51 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Sun, 29 Jul 2018 19:17:26 +0200
Subject: [PATCH] override -> final + MetaOperationRoot (which does not work so
 far)

---
 src/include/functional_multi_array.h          | 79 ++++++++++++++--
 src/include/multi_array_operation.h           | 89 ++++++++++++++++++-
 .../ranges/range_types/classic_range.h        | 16 ++--
 src/include/ranges/range_types/null_range.h   | 16 ++--
 src/include/ranges/range_types/space_range.h  | 14 +--
 src/include/ranges/range_types/spin_range.h   | 16 ++--
 src/include/ranges/single_range.h             | 19 ++--
 src/tests/op_unit_test.cc                     | 17 ++++
 8 files changed, 215 insertions(+), 51 deletions(-)

diff --git a/src/include/functional_multi_array.h b/src/include/functional_multi_array.h
index 68afbca..1f7202c 100644
--- a/src/include/functional_multi_array.h
+++ b/src/include/functional_multi_array.h
@@ -18,8 +18,9 @@ namespace MultiArrayTools
 	    std::vector<typename Index::MetaType> vv(i->range()->size());
 	    for(Index j = (*i); j.pos() != j.max(); ++j){
 		vv[j.pos()] = j.meta();
-	    }
-	    return MultiArray<typename Index::MetaType, typename Index::RangeType>( i->range(), std::move( vv ) );
+		VCHECK(j.meta());
+	    }	    
+	    return MultiArray<typename Index::MetaType, typename Index::RangeType>( i->range(), vv );
 	}
     };
 
@@ -33,14 +34,65 @@ namespace MultiArrayTools
 	    return ConstSlice<typename Index::MetaType, typename Index::RangeType>( i->range(), i->metaPtr() );
 	}
     };
-    
+
     template <class Index>
     auto mkMAObject(const std::shared_ptr<Index>& i)
-	-> decltype(ToMAObject<Index::RangeType::HASMETACONT>::mk(i))
+	-> std::shared_ptr<decltype(ToMAObject<Index::RangeType::HASMETACONT>::mk(i))>
     {
-	return ToMAObject<Index::RangeType::HASMETACONT>::mk(i);
+	return std::make_shared<decltype(ToMAObject<Index::RangeType::HASMETACONT>::mk(i))>
+	    (ToMAObject<Index::RangeType::HASMETACONT>::mk(i));
     }
+    /*
+    template <bool HASMETACONT>
+    struct ToOpObject
+    {
+	template <class Index>
+	static auto mk(const std::shared_ptr<Index>& ind)
+	    -> MetaOperationRoot<typename Index::RangeType>
+	{
+	    typedef typename Index::RangeType RangeType;
+	    MultiRangeFactory<RangeType> mrf(ind->range());
+	    auto mr = std::dynamic_pointer_cast<RangeType>( mrf.create() );
+	    typedef typename MultiRange<RangeType>::IndexType::MetaType value_type;
+	    ContainerIndex<value_type,Index> ci(mr,0);
+	    return MetaOperationRoot<typename Index::RangeType>(ci);
+	}
+    };
+    
+    template <>
+    struct ToOpObject<true>
+    {
+	template <class Index>
+	static auto mk(const std::shared_ptr<Index>& ind)
+	    -> ConstOperationRoot<typename Index::MetaType,
+				  typename Index::RangeType>
+	{
+	    return ConstOperationRoot<typename Index::MetaType,
+				      typename Index::RangeType>( mkMAObject(ind), ind);
+	}
+    };
+    */
 
+    template <bool HASMETACONT>
+    struct ToOpObject
+    {
+	template <class Index>
+	static auto mk(const std::shared_ptr<Index>& ind)
+	    -> ConstOperationRoot<typename Index::MetaType,
+				  typename Index::RangeType>
+	{
+	    return ConstOperationRoot<typename Index::MetaType,
+				      typename Index::RangeType>( mkMAObject(ind), ind);
+	}
+    };
+
+    
+    template <class Index>
+    auto mkOpObject(const std::shared_ptr<Index>& i)
+	-> decltype(ToOpObject<Index::RangeType::HASMETACONT>::mk(i))
+    {
+	return ToOpObject<Index::RangeType::HASMETACONT>::mk(i);
+    }
     
     template <typename T, class Function, class... SRanges>
     class FunctionalMultiArray : public MultiArrayBase<T,SRanges...>
@@ -78,8 +130,9 @@ namespace MultiArrayTools
 	// EVALUTAION CLASS ??!!!!
 
 	auto exec(const std::shared_ptr<typename SRanges::IndexType>&... inds) const
-	    -> decltype( mkOperation( mFunc, ConstOperationRoot<typename SRanges::IndexType::MetaType,SRanges>( mkMAObject( inds ), inds) ... ) );
-
+	//	    -> decltype( mkOperation( mFunc, ConstOperationRoot<typename SRanges::IndexType::MetaType,SRanges>( mkMAObject( inds ), inds) ... ) );
+	    -> decltype( mkOperation( mFunc, mkOpObject(inds) ... ) );
+	    
 	virtual ConstOperationRoot<T,SRanges...>
 	operator()(const std::shared_ptr<typename SRanges::IndexType>&... inds) const override;
 	
@@ -184,7 +237,7 @@ namespace MultiArrayTools
 	return ConstOperationRoot<T,SRanges...>( *mMaPtr, inds... );
     }
 
-    
+    /*
     template <typename T, class Function, class... SRanges>
     auto FunctionalMultiArray<T,Function,SRanges...>::
     exec(const std::shared_ptr<typename SRanges::IndexType>&... inds) const
@@ -192,8 +245,16 @@ namespace MultiArrayTools
     {
  	return mkOperation( mFunc, ConstOperationRoot<typename SRanges::IndexType::MetaType,SRanges>( mkMAObject( inds ), inds ) ... );
     }
+    */
+
+    template <typename T, class Function, class... SRanges>
+    auto FunctionalMultiArray<T,Function,SRanges...>::
+    exec(const std::shared_ptr<typename SRanges::IndexType>&... inds) const
+	-> decltype( mkOperation( mFunc, mkOpObject(inds) ... ) )
+    {
+ 	return mkOperation( mFunc, mkOpObject(inds) ... );
+    }
 
-    
 } // namespace MultiArrayTools
 
 #endif
diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h
index d7fdfd6..fac81ce 100644
--- a/src/include/multi_array_operation.h
+++ b/src/include/multi_array_operation.h
@@ -141,6 +141,9 @@ namespace MultiArrayTools
 	ConstOperationRoot(const MultiArrayBase<T,Ranges...>& ma,
 			   const std::shared_ptr<typename Ranges::IndexType>&... indices);
 
+	ConstOperationRoot(std::shared_ptr<MultiArrayBase<T,Ranges...> > maptr,
+			   const std::shared_ptr<typename Ranges::IndexType>&... indices);
+
 	ConstOperationRoot(const T* data, const IndexType& ind);
 
 	template <class ET>
@@ -156,8 +159,40 @@ namespace MultiArrayTools
 	//MultiArrayBase<T,Ranges...> const& mArrayRef;
 	const T* mDataPtr;
 	IndexType mIndex;
+	std::shared_ptr<MultiArrayBase<T,Ranges...> > mMaPtr;
     };
-    
+
+    template <class... Ranges>
+    class MetaOperationRoot : public OperationTemplate<std::tuple<typename Ranges::IndexType...>,
+						       MetaOperationRoot<Ranges...> >
+    {
+    public:
+
+	typedef ContainerIndex<std::tuple<typename Ranges::IndexType::MetaType...>,
+			       typename Ranges::IndexType...> IndexType;
+	typedef typename IndexType::MetaType value_type;
+	typedef OperationBase<value_type,MetaOperationRoot<Ranges...> > OT;
+	typedef ContainerRange<value_type,Ranges...> CRange;
+	
+	static constexpr size_t SIZE = 1;
+	
+	MetaOperationRoot(const IndexType& ind);
+
+	template <class ET>
+	inline value_type get(ET pos) const;
+
+	MExt<void> rootSteps(std::intptr_t iPtrNum = 0) const; // nullptr for simple usage with decltype
+
+	template <class Expr>
+	Expr loop(Expr exp) const;
+		
+    private:
+
+	//MultiArrayBase<T,Ranges...> const& mArrayRef;
+	//const T* mDataPtr;
+	IndexType mIndex;
+    };
+
     template <typename T, class... Ranges>
     class OperationRoot : public OperationTemplate<T,OperationRoot<T,Ranges...> >
     {
@@ -466,6 +501,18 @@ namespace MultiArrayTools
 		       const std::shared_ptr<typename Ranges::IndexType>&... indices) :
 	mDataPtr(ma.data()),
 	mIndex( ma.begin() )
+    {
+	//VCHECK(ma.data());
+	mIndex(indices...);
+    }
+
+    template <typename T, class... Ranges>
+    ConstOperationRoot<T,Ranges...>::
+    ConstOperationRoot(std::shared_ptr<MultiArrayBase<T,Ranges...> > maptr,
+		       const std::shared_ptr<typename Ranges::IndexType>&... indices) :
+	mDataPtr(maptr->data()),
+	mIndex(maptr->begin()),
+	mMaPtr(maptr)
     {
 	mIndex(indices...);
     }
@@ -480,6 +527,9 @@ namespace MultiArrayTools
     template <class ET>
     inline T ConstOperationRoot<T,Ranges...>::get(ET pos) const
     {
+	//VCHECK(pos.val());
+	//VCHECK(mDataPtr);
+	//VCHECK(mDataPtr[pos.val()])
 	return mDataPtr[pos.val()];
     }
 
@@ -497,7 +547,42 @@ namespace MultiArrayTools
     {
 	return exp;
     }
-    
+
+    /****************************
+     *   MetaOperationRoot     *
+     ****************************/
+
+    template <class... Ranges>
+    MetaOperationRoot<Ranges...>::
+    MetaOperationRoot(const IndexType& ind) :
+	mIndex( ind ) { }
+
+    template <class... Ranges>
+    template <class ET>
+    inline typename MetaOperationRoot<Ranges...>::value_type
+    MetaOperationRoot<Ranges...>::get(ET pos) const
+    {
+	//VCHECK(pos.val());
+	//VCHECK(mDataPtr);
+	//VCHECK(mDataPtr[pos.val()])
+	return mIndex.meta(pos.val());
+    }
+
+    template <class... Ranges>
+    MExt<void> MetaOperationRoot<Ranges...>::rootSteps(std::intptr_t iPtrNum) const
+    {
+	return MExt<void>(getStepSize( mIndex, iPtrNum ));
+	//return MExt<void>(getStepSize( getRootIndices( mIndex->info() ), iPtrNum ));
+    }
+
+
+    template <class... Ranges>
+    template <class Expr>
+    Expr MetaOperationRoot<Ranges...>::loop(Expr exp) const
+    {
+	return exp;
+    }
+
     /***********************
      *   OperationRoot     *
      ***********************/
diff --git a/src/include/ranges/range_types/classic_range.h b/src/include/ranges/range_types/classic_range.h
index 9b8cb55..ba07956 100644
--- a/src/include/ranges/range_types/classic_range.h
+++ b/src/include/ranges/range_types/classic_range.h
@@ -35,20 +35,20 @@ namespace MultiArrayTools
 	typedef SingleRange<size_t,SpaceType::NONE> RangeType;
 	typedef size_t MetaType;
 	
-	virtual size_t size() const override;
-	virtual size_t dim() const override;
+	virtual size_t size() const final;
+	virtual size_t dim() const final;
 
-	virtual SpaceType spaceType() const override;
+	virtual SpaceType spaceType() const final;
 	
-	virtual std::string stringMeta(size_t pos) const override;
-	virtual std::vector<char> data() const override;
+	virtual std::string stringMeta(size_t pos) const final;
+	virtual std::vector<char> data() const final;
 	
 	size_t get(size_t pos) const;
 	size_t getMeta(size_t metaPos) const;
 	
-	virtual IndexType begin() const override;
-	virtual IndexType end() const override;
-	//virtual std::shared_ptr<VIWB> index() const override;
+	virtual IndexType begin() const final;
+	virtual IndexType end() const final;
+	//virtual std::shared_ptr<VIWB> index() const final;
 	
 	friend SingleRangeFactory<size_t,SpaceType::NONE>;
 
diff --git a/src/include/ranges/range_types/null_range.h b/src/include/ranges/range_types/null_range.h
index d0a83b9..a4e5882 100644
--- a/src/include/ranges/range_types/null_range.h
+++ b/src/include/ranges/range_types/null_range.h
@@ -42,20 +42,20 @@ namespace MultiArrayTools
 	typedef SingleRange<size_t,SpaceType::NUL> RangeType;
 	typedef size_t MetaType;
 	
-	virtual size_t size() const override;
-	virtual size_t dim() const override;
+	virtual size_t size() const final;
+	virtual size_t dim() const final;
 
-	virtual std::string stringMeta(size_t pos) const override;
-	virtual std::vector<char> data() const override;
+	virtual std::string stringMeta(size_t pos) const final;
+	virtual std::vector<char> data() const final;
 
-	virtual SpaceType spaceType() const override;
+	virtual SpaceType spaceType() const final;
 	
 	size_t get(size_t pos) const;
 	size_t getMeta(size_t metapos) const;
 	
-	virtual IndexType begin() const override;
-	virtual IndexType end() const override;
-	//virtual std::shared_ptr<VIWB> index() const override;
+	virtual IndexType begin() const final;
+	virtual IndexType end() const final;
+	//virtual std::shared_ptr<VIWB> index() const final;
 	
 	friend SingleRangeFactory<size_t,SpaceType::NUL>;
 
diff --git a/src/include/ranges/range_types/space_range.h b/src/include/ranges/range_types/space_range.h
index 8758a0d..5d4878d 100644
--- a/src/include/ranges/range_types/space_range.h
+++ b/src/include/ranges/range_types/space_range.h
@@ -34,19 +34,19 @@ namespace MultiArrayTools
 	typedef SingleRange<int,SpaceType::PSPACE> RangeType;
 	typedef int MetaType;
 	
-	virtual size_t size() const override;
-	virtual size_t dim() const override;
+	virtual size_t size() const final;
+	virtual size_t dim() const final;
 
-	virtual std::string stringMeta(size_t pos) const override;
-	virtual std::vector<char> data() const override;
+	virtual std::string stringMeta(size_t pos) const final;
+	virtual std::vector<char> data() const final;
 
-	virtual SpaceType spaceType() const override;
+	virtual SpaceType spaceType() const final;
 	
 	int get(size_t pos) const;
 	size_t getMeta(int metaPos) const;
 	
-	virtual IndexType begin() const override;
-	virtual IndexType end() const override;
+	virtual IndexType begin() const final;
+	virtual IndexType end() const final;
 	
 	friend SingleRangeFactory<int,SpaceType::PSPACE>;
 
diff --git a/src/include/ranges/range_types/spin_range.h b/src/include/ranges/range_types/spin_range.h
index 80031cd..b1f3e8c 100644
--- a/src/include/ranges/range_types/spin_range.h
+++ b/src/include/ranges/range_types/spin_range.h
@@ -35,20 +35,20 @@ namespace MultiArrayTools
 	typedef SingleRange<size_t,SpaceType::SPIN> RangeType;
 	typedef size_t MetaType;
 	
-	virtual size_t size() const override;
-	virtual size_t dim() const override;
+	virtual size_t size() const final;
+	virtual size_t dim() const final;
 
-	virtual std::string stringMeta(size_t pos) const override;
-	virtual std::vector<char> data() const override;
+	virtual std::string stringMeta(size_t pos) const final;
+	virtual std::vector<char> data() const final;
 
-	virtual SpaceType spaceType() const override;
+	virtual SpaceType spaceType() const final;
 	
 	size_t get(size_t pos) const;
 	size_t getMeta(size_t metaPos) const;
 	
-	virtual IndexType begin() const override;
-	virtual IndexType end() const override;
-	//virtual std::shared_ptr<VIWB> index() const override;
+	virtual IndexType begin() const final;
+	virtual IndexType end() const final;
+	//virtual std::shared_ptr<VIWB> index() const final;
 	
 	friend SingleRangeFactory<size_t,SpaceType::SPIN>;
 
diff --git a/src/include/ranges/single_range.h b/src/include/ranges/single_range.h
index df3dce6..9dca047 100644
--- a/src/include/ranges/single_range.h
+++ b/src/include/ranges/single_range.h
@@ -80,6 +80,7 @@ namespace MultiArrayTools
 	    -> For<SingleIndex<U,TYPE>,Expr,ForType::HIDDEN>;
 
     private:
+	std::shared_ptr<RangeType> mExplicitRangePtr;
 	const U* mMetaPtr;
     };
 
@@ -106,19 +107,19 @@ namespace MultiArrayTools
 	typedef U MetaType;
 	//typedef typename RangeInterface<SingleIndex<U,TYPE> >::IndexType IndexType;
 	
-	virtual size_t size() const override;
-	virtual size_t dim() const override;
+	virtual size_t size() const final;
+	virtual size_t dim() const final;
 
-	virtual SpaceType spaceType() const override;
+	virtual SpaceType spaceType() const final;
 	
-	virtual std::string stringMeta(size_t pos) const override;
-	virtual std::vector<char> data() const override;
+	virtual std::string stringMeta(size_t pos) const final;
+	virtual std::vector<char> data() const final;
 	
 	const U& get(size_t pos) const;
 	size_t getMeta(const U& metaPos) const;
 	
-	virtual IndexType begin() const override;
-	virtual IndexType end() const override;
+	virtual IndexType begin() const final;
+	virtual IndexType end() const final;
 		
 	friend SingleRangeFactory<U,TYPE>;
 
@@ -184,6 +185,7 @@ namespace MultiArrayTools
     template <typename U, SpaceType TYPE>
     SingleIndex<U,TYPE>::SingleIndex(const std::shared_ptr<SingleRange<U,TYPE> >& range) :
 	IndexInterface<SingleIndex<U,TYPE>,U>(range, 0),
+	mExplicitRangePtr(std::dynamic_pointer_cast<RangeType>(IB::mRangePtr)),
 	mMetaPtr(MetaPtrHandle<SingleIndex<U,TYPE>::RangeType::HASMETACONT>::set
 		 ( dynamic_cast<RangeType*>(IB::mRangePtr.get() ) ) ) {}
 
@@ -238,8 +240,7 @@ namespace MultiArrayTools
     U SingleIndex<U,TYPE>::meta() const
     {
 	return MetaPtrHandle<SingleIndex<U,TYPE>::RangeType::HASMETACONT>::getMeta
-	    ( mMetaPtr, IB::mPos,
-	      std::dynamic_pointer_cast<SingleRange<U,TYPE> const>( IB::mRangePtr ) );
+	    ( mMetaPtr, IB::mPos, mExplicitRangePtr );
     }
 
     template <typename U, SpaceType TYPE>
diff --git a/src/tests/op_unit_test.cc b/src/tests/op_unit_test.cc
index ea69ee3..7bb1e43 100644
--- a/src/tests/op_unit_test.cc
+++ b/src/tests/op_unit_test.cc
@@ -531,6 +531,23 @@ namespace {
 	EXPECT_EQ( xround( res.at(mkt(mkt('3','b'),'B')) ), xround(2.911 + 4.790 - 2.210)  );
     }
 
+    TEST_F(OpTest_MDim, ExecOpAnon)
+    {
+	MultiArray<double,MRange> ma1(mr1ptr, v3);
+	MultiArray<double,AnonymousRange> maa
+	    = *std::dynamic_pointer_cast<MultiArray<double,AnonymousRange>>( ma1.anonymous() );
+	MultiArray<double,AnonymousRange> maa2( maa.template getRangePtr<0>() );
+
+	auto ar = maa.template getRangePtr<0>();
+	auto i1 = MAT::getIndex( ar );
+	
+	maa2(i1) = maa(i1) * maa(i1);
+	EXPECT_EQ( xround( maa2.at(0) ), xround(  v3[0]*v3[0] ) );
+	for((*i1) = 0; i1->pos() != i1->max(); ++(*i1) ){
+	    EXPECT_EQ( xround( maa2.at(i1->meta()) ), xround( maa.at(i1->meta()) * maa.at(i1->meta()) ) );
+	}
+    }
+
     template <typename T>
     struct Monopole
     {