From d7e5098639104cea5515a8dd991f7d6d0df1cb44 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Thu, 15 Feb 2018 16:24:54 +0100
Subject: [PATCH] remove VIWB stuff

---
 src/include/helper_tools.h                    |  9 ++--
 src/include/ranges/anonymous_range.h          |  3 +-
 src/include/ranges/container_range.h          | 25 -----------
 src/include/ranges/index_base.h               |  8 ----
 src/include/ranges/index_info.h               |  1 -
 src/include/ranges/multi_range.h              | 28 +-----------
 src/include/ranges/range_base.h               |  3 --
 .../ranges/range_types/classic_range.h        |  2 +-
 src/include/ranges/range_types/spin_range.h   |  2 +-
 src/include/ranges/rbase_def.h                |  8 ----
 src/include/ranges/rpack_num.h                | 34 ---------------
 src/include/ranges/single_range.h             | 22 +---------
 src/include/ranges/vindex_base.h              | 35 ---------------
 src/include/ranges/vindex_wrapper.h           | 43 -------------------
 src/lib/ranges/anonymous_range.cc             |  7 +--
 src/lib/ranges/range_types/classic_range.cc   |  3 +-
 src/lib/ranges/range_types/spin_range.cc      |  3 +-
 src/tests/op_perf_test.cc                     |  2 -
 src/tests/op_unit_test.cc                     |  2 -
 19 files changed, 18 insertions(+), 222 deletions(-)
 delete mode 100644 src/include/ranges/vindex_base.h
 delete mode 100644 src/include/ranges/vindex_wrapper.h

diff --git a/src/include/helper_tools.h b/src/include/helper_tools.h
index 8f53e4e..e133713 100644
--- a/src/include/helper_tools.h
+++ b/src/include/helper_tools.h
@@ -36,19 +36,18 @@ namespace MultiArrayTools
     auto getIndex(std::shared_ptr<RangeType> range)
 	-> std::shared_ptr<typename RangeType::IndexType>
     {
-	return std::dynamic_pointer_cast<IndexWrapper<typename RangeType::IndexType> >
-	    ( range->index() )->get();
+	return std::make_shared<typename RangeType::IndexType>(range);
     }
 
     template <class RangeType>
-    auto getIndex() -> std::shared_ptr<typename RangeType::IndexType>
+    auto getIndex()
+	-> std::shared_ptr<typename RangeType::IndexType>
     {
 	static_assert( RangeType::defaultable,
 		       /*typeid(typename RangeType).name() + */" is not defaultable" );
 	static auto f = RangeType::factory();
 	static auto r = std::dynamic_pointer_cast<RangeType>( f.create() );
-	return std::dynamic_pointer_cast<IndexWrapper<typename RangeType::IndexType> >
-	    ( r->index() )->get();
+	return std::make_shared<typename RangeType::IndexType>(r);
     }
     
     template <class... RangeTypes>
diff --git a/src/include/ranges/anonymous_range.h b/src/include/ranges/anonymous_range.h
index 55d43e8..8f0a8bc 100644
--- a/src/include/ranges/anonymous_range.h
+++ b/src/include/ranges/anonymous_range.h
@@ -44,8 +44,7 @@ namespace MultiArrayTools
 	
 	virtual IndexType begin() const override;
 	virtual IndexType end() const override;
-	virtual std::shared_ptr<VIWB> index() const override;
-	
+		
 	friend AnonymousRangeFactory;
 	
     protected:
diff --git a/src/include/ranges/container_range.h b/src/include/ranges/container_range.h
index f2f0c8c..fa9240d 100644
--- a/src/include/ranges/container_range.h
+++ b/src/include/ranges/container_range.h
@@ -81,7 +81,6 @@ namespace MultiArrayTools
 	template <size_t N>
 	auto getPtr() -> decltype( std::get<N>( mIPack ) )&;
 
-	std::shared_ptr<VIWB> getVPtr(size_t n);
 	size_t getStepSize(size_t n);
 
 	std::vector<IndexInfo> infoVec() const;
@@ -153,8 +152,6 @@ namespace MultiArrayTools
 	
 	virtual IndexType begin() const override;
 	virtual IndexType end() const override;
-	
-	virtual std::shared_ptr<VIWB> index() const override;
 
 	friend ContainerRangeFactory<Ranges...>;
 
@@ -329,17 +326,6 @@ namespace MultiArrayTools
 	return std::get<N>( mIPack );
     }
 
-    template <class... Indices>
-    std::shared_ptr<VIWB> ContainerIndex<Indices...>::getVPtr(size_t n)
-    {
-	if(n >= sizeof...(Indices)){
-	    assert(0);
-	    // throw !!
-	}
-	ContainerIndex<Indices...> const* t = this;
-	return RPackNum<sizeof...(Indices)-1>::getIndexPtr(*t, n);
-    }
-
     template <class... Indices>
     size_t ContainerIndex<Indices...>::getStepSize(size_t n)
     {
@@ -480,17 +466,6 @@ namespace MultiArrayTools
 	i = size();
 	return i;
     }
-    
-    template <class... Ranges>
-    std::shared_ptr<VIWB> ContainerRange<Ranges...>::index() const
-    {
-	typedef IndexWrapper<IndexType> IW;
-	return std::make_shared<IW>
-	    ( std::make_shared<IndexType>
-	      ( std::dynamic_pointer_cast<ContainerRange<Ranges...> >
-		( std::shared_ptr<RangeBase>( RB::mThis ) ) ) );
-    }
-    
 } // end namespace MultiArrayTools
 
 
diff --git a/src/include/ranges/index_base.h b/src/include/ranges/index_base.h
index 99b6b0f..0fc2b2e 100644
--- a/src/include/ranges/index_base.h
+++ b/src/include/ranges/index_base.h
@@ -10,7 +10,6 @@
 #include "rbase_def.h"
 #include "range_base.h"
 #include "index_type.h"
-#include "vindex_wrapper.h"
 #include "index_info.h"
 
 #include "xfor/xfor.h"
@@ -52,13 +51,6 @@ namespace MultiArrayTools
 
 	
 	std::shared_ptr<RangeBase> vrange() const { return mRangePtr; }
-	/*auto range() const -> decltype( I::S_range(THIS()) ) { return I::S_range(THIS()); }
-	
-	template <size_t N>
-	auto getPtr() const -> decltype(I::template S_get<N>(THIS()))
-	{ return I::template S_get<N>(THIS()); }
-	*/
-	std::shared_ptr<VIWB> getVPtr(size_t n) const { return THIS().getVPtr(n); }
 
 	std::vector<IndexInfo> infoVec() const { return THIS().infoVec(); }
 	
diff --git a/src/include/ranges/index_info.h b/src/include/ranges/index_info.h
index 01efba3..8e0d4a1 100644
--- a/src/include/ranges/index_info.h
+++ b/src/include/ranges/index_info.h
@@ -7,7 +7,6 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "vindex_base.h"
 #include "index_type.h"
 
 namespace MultiArrayTools
diff --git a/src/include/ranges/multi_range.h b/src/include/ranges/multi_range.h
index c6d27fe..c58839d 100644
--- a/src/include/ranges/multi_range.h
+++ b/src/include/ranges/multi_range.h
@@ -96,8 +96,7 @@ namespace MultiArrayTools
 
 	template <size_t N>
 	auto getPtr() -> decltype( std::get<N>( mIPack ) )&;
-	
-	std::shared_ptr<VIWB> getVPtr(size_t n);
+
 	size_t getStepSize(size_t n);
 
 	std::vector<IndexInfo> infoVec() const;
@@ -174,8 +173,6 @@ namespace MultiArrayTools
 	virtual IndexType begin() const override;
 	virtual IndexType end() const override;
 
-	virtual std::shared_ptr<VIWB> index() const override;
-
 	friend MultiRangeFactory<Ranges...>;
 
 	static constexpr bool defaultable = false;
@@ -373,18 +370,7 @@ namespace MultiArrayTools
     {
 	return std::get<N>(mIPack);
     }
-	
-    template <class... Indices>
-    std::shared_ptr<VIWB> MultiIndex<Indices...>::getVPtr(size_t n)
-    {
-	if(n >= sizeof...(Indices)){
-	    assert(0);
-	    // throw !!
-	}
-	MultiIndex<Indices...> const* t = this;
-	return RPackNum<sizeof...(Indices)-1>::getIndexPtr(*t, n);
-    }
-    
+
     template <class... Indices>	
     size_t MultiIndex<Indices...>::getStepSize(size_t n)
     {
@@ -528,16 +514,6 @@ namespace MultiArrayTools
 	i = size();
 	return i;
     }
-
-    template <class... Ranges>
-    std::shared_ptr<VIWB> MultiRange<Ranges...>::index() const
-    {
-	typedef IndexWrapper<IndexType> IW;
-	return std::make_shared<IW>
-	    ( std::make_shared<IndexType>
-	      ( std::dynamic_pointer_cast<MultiRange<Ranges...> >
-		( std::shared_ptr<RangeBase>( RB::mThis ) ) ) );
-    }
 }
 
 #endif
diff --git a/src/include/ranges/range_base.h b/src/include/ranges/range_base.h
index a0f38c4..e10f847 100644
--- a/src/include/ranges/range_base.h
+++ b/src/include/ranges/range_base.h
@@ -13,7 +13,6 @@ namespace MultiArrayTools
 {
     class RangeBase;
 }
-#include "vindex_base.h"
 
 namespace MultiArrayTools
 {
@@ -55,8 +54,6 @@ namespace MultiArrayTools
 	    
 	virtual size_t size() const = 0;
 	virtual size_t dim() const = 0;
-	
-	virtual std::shared_ptr<VIWB> index() const = 0;
 
 	bool operator==(const RangeBase& in) const;
 	bool operator!=(const RangeBase& in) const;
diff --git a/src/include/ranges/range_types/classic_range.h b/src/include/ranges/range_types/classic_range.h
index c2cc71c..5ff0649 100644
--- a/src/include/ranges/range_types/classic_range.h
+++ b/src/include/ranges/range_types/classic_range.h
@@ -37,7 +37,7 @@ namespace MultiArrayTools
 	
 	virtual IndexType begin() const override;
 	virtual IndexType end() const override;
-	virtual std::shared_ptr<VIWB> index() const override;
+	//virtual std::shared_ptr<VIWB> index() const override;
 	
 	friend SingleRangeFactory<size_t,SpaceType::NONE>;
 
diff --git a/src/include/ranges/range_types/spin_range.h b/src/include/ranges/range_types/spin_range.h
index 2e330ed..c9215f2 100644
--- a/src/include/ranges/range_types/spin_range.h
+++ b/src/include/ranges/range_types/spin_range.h
@@ -41,7 +41,7 @@ namespace MultiArrayTools
 	
 	virtual IndexType begin() const override;
 	virtual IndexType end() const override;
-	virtual std::shared_ptr<VIWB> index() const override;
+	//virtual std::shared_ptr<VIWB> index() const override;
 	
 	friend SingleRangeFactory<size_t,SpaceType::SPIN>;
 
diff --git a/src/include/ranges/rbase_def.h b/src/include/ranges/rbase_def.h
index 5521720..5d0cc67 100644
--- a/src/include/ranges/rbase_def.h
+++ b/src/include/ranges/rbase_def.h
@@ -22,14 +22,6 @@ namespace MultiArrayTools
     template <class Index>
     class RangeInterface;
 
-    // index_base.h
-    class VirtualIndexWrapperBase;
-    typedef VirtualIndexWrapperBase VIWB;    
-    
-    // index_base.h
-    template <class I>
-    class IndexWrapper;
-    
     // index_base.h
     template <class I, typename MetaType>
     class IndexInterface;
diff --git a/src/include/ranges/rpack_num.h b/src/include/ranges/rpack_num.h
index e41f3b3..ab76076 100644
--- a/src/include/ranges/rpack_num.h
+++ b/src/include/ranges/rpack_num.h
@@ -3,7 +3,6 @@
 #define __rpack_num_h__
 
 #include <memory>
-#include "vindex_wrapper.h"
 #include "index_info.h"
 
 namespace MultiArrayHelper
@@ -41,28 +40,6 @@ namespace MultiArrayHelper
     template <size_t N>
     struct RPackNum
     {
-	template <class IndexType>
-	static std::shared_ptr<VIWB> getIndex(const IndexType& in, size_t n)
-	{
-	    if(n == N){
-		return make_viwb( in.template get<N>() );
-	    }
-	    else {
-		return RPackNum<N-1>::getIndex(in, n);
-	    }
-	}
-
-	template <class IndexType>
-	static std::shared_ptr<VIWB> getIndexPtr(const IndexType& in, size_t n)
-	{
-	    if(n == N){
-		return make_viwb( in.template getPtr<N>() );
-	    }
-	    else {
-		return RPackNum<N-1>::getIndexPtr(in, n);
-	    }
-	}
-
 	template <class... Indices>
 	static void initBlockSizes(std::array<size_t,sizeof...(Indices)+1>& bs,
 				   std::tuple<std::shared_ptr<Indices>...>& ip)
@@ -271,17 +248,6 @@ namespace MultiArrayHelper
     template<>
     struct RPackNum<0>
     {
-	template <class IndexType>
-	static std::shared_ptr<VIWB> getIndex(const IndexType& in, size_t n)
-	{
-	    return make_viwb( in.template get<0>() );
-	}
-
-	template <class IndexType>
-	static std::shared_ptr<VIWB> getIndexPtr(const IndexType& in, size_t n)
-	{
-	    return make_viwb( in.template getPtr<0>() );
-	}
 
 	template <class... Indices>
 	static void initBlockSizes(std::array<size_t,sizeof...(Indices)+1>& bs,
diff --git a/src/include/ranges/single_range.h b/src/include/ranges/single_range.h
index f85f7b4..73df9a0 100644
--- a/src/include/ranges/single_range.h
+++ b/src/include/ranges/single_range.h
@@ -57,7 +57,6 @@ namespace MultiArrayTools
 	template <size_t N>
 	void getPtr();
 
-	std::shared_ptr<VIWB> getVPtr(size_t n);
 	size_t getStepSize(size_t n);
 
 	std::vector<IndexInfo> infoVec() const;
@@ -104,8 +103,7 @@ namespace MultiArrayTools
 	
 	virtual IndexType begin() const override;
 	virtual IndexType end() const override;
-	virtual std::shared_ptr<VIWB> index() const override;
-	
+		
 	friend SingleRangeFactory<U,TYPE>;
 
 	static constexpr bool defaultable = false;
@@ -221,12 +219,6 @@ namespace MultiArrayTools
     template <size_t N>
     void SingleIndex<U,TYPE>::getPtr() {}
 
-    template <typename U, SpaceType TYPE>
-    std::shared_ptr<VIWB> SingleIndex<U,TYPE>::getVPtr(size_t n)
-    {
-	return std::shared_ptr<VIWB>();
-    }
-
     template <typename U, SpaceType TYPE>
     std::vector<IndexInfo> SingleIndex<U,TYPE>::infoVec() const
     {
@@ -348,18 +340,6 @@ namespace MultiArrayTools
 	i = size();
 	return i;
     }
-
-    // put this in the interface class !!!
-    template <typename U, SpaceType TYPE>
-    std::shared_ptr<VIWB> SingleRange<U,TYPE>::index() const
-    {
-	typedef IndexWrapper<IndexType> IW;
-	return std::make_shared<IW>
-	    ( std::make_shared<IndexType>
-	      ( std::dynamic_pointer_cast<SingleRange<U,TYPE> >
-		( std::shared_ptr<RangeBase>( RB::mThis ) ) ) );
-    }
-
 }
 
 #include "range_types/header.h"
diff --git a/src/include/ranges/vindex_base.h b/src/include/ranges/vindex_base.h
deleted file mode 100644
index 114d2e1..0000000
--- a/src/include/ranges/vindex_base.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#ifndef __vindex_base_h__
-#define __vindex_base_h__
-
-//#include "ranges/range_base.h"
-#include "ranges/index_type.h"
-#include "base_def.h"
-
-namespace MultiArrayTools
-{
-
-#ifndef __range_base_h__
-    class RangeBase;
-#endif
-    
-    class VirtualIndexWrapperBase
-    {
-    public:
-	DEFAULT_MEMBERS(VirtualIndexWrapperBase);
-	
-	virtual IndexType type() const = 0;
-	virtual size_t dim() const = 0;
-	virtual size_t pos() const = 0;
-	virtual size_t max() const = 0;
-	virtual std::shared_ptr<RangeBase> rangePtr() const = 0;
-	virtual std::shared_ptr<VirtualIndexWrapperBase> getPtr(size_t n) const = 0;
-	virtual std::intptr_t getPtrNum() const = 0;
-	virtual size_t getStepSize(size_t n) const = 0;
-    };
-
-    typedef VirtualIndexWrapperBase VIWB;
-
-} // end namespace MultiArrayTools
-
-#endif
diff --git a/src/include/ranges/vindex_wrapper.h b/src/include/ranges/vindex_wrapper.h
deleted file mode 100644
index 705269f..0000000
--- a/src/include/ranges/vindex_wrapper.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#ifndef __vindex_wrapper_h__
-#define __vindex_wrapper_h__
-
-#include "ranges/vindex_base.h"
-
-namespace MultiArrayTools
-{
-    
-    template <class I>
-    std::shared_ptr<IndexWrapper<I> > make_viwb(std::shared_ptr<I> idxPtr)
-    {
-	return std::make_shared<IndexWrapper<I> >(idxPtr);
-    }
-    
-    template <class I>
-    class IndexWrapper : public VirtualIndexWrapperBase
-    {
-    public:
-	
-	DEFAULT_MEMBERS(IndexWrapper);
-
-	IndexWrapper(std::shared_ptr<I> idxPtr) : mIdxPtr(idxPtr) {}
-
-	virtual IndexType type() const override { return mIdxPtr->type(); }
-	virtual size_t dim() const override { return mIdxPtr->dim(); }
-	virtual size_t pos() const override { return mIdxPtr->pos(); }
-	virtual size_t max() const override { return mIdxPtr->max(); }
-	virtual std::shared_ptr<RangeBase> rangePtr() const override { return mIdxPtr->vrange(); }
-	virtual std::shared_ptr<VirtualIndexWrapperBase> getPtr(size_t n) const override
-	{ return mIdxPtr->getVPtr(n); }
-	virtual std::intptr_t getPtrNum() const override { return reinterpret_cast<std::intptr_t>( mIdxPtr.get() ); }
-	virtual size_t getStepSize(size_t n) const override { return mIdxPtr->getStepSize(n); }
-
-	std::shared_ptr<I> get() const { return mIdxPtr; } // unwrap
-	
-    private:
-	std::shared_ptr<I> mIdxPtr;
-    };
-
-}
-
-#endif
diff --git a/src/lib/ranges/anonymous_range.cc b/src/lib/ranges/anonymous_range.cc
index f0ce0fc..0d3bdd5 100644
--- a/src/lib/ranges/anonymous_range.cc
+++ b/src/lib/ranges/anonymous_range.cc
@@ -56,16 +56,17 @@ namespace MultiArrayTools
     }
 
     // put this in the interface class !!!
+    /*
     std::shared_ptr<VIWB> AnonymousRange::index() const
     {
 	//typedef IndexWrapper<IndexType> IW;
 	return std::shared_ptr<VIWB>();
-	/*	    std::make_shared<IW>
+		    std::make_shared<IW>
 	    (std::make_shared<IndexType>
 	     ( std::dynamic_pointer_cast<AnonymousRange>
-	     ( std::shared_ptr<RangeBase>( RB::mThis ) ) ) ); */ //!!!!
+	     ( std::shared_ptr<RangeBase>( RB::mThis ) ) ) );  //!!!!
     }
-
+    */
     
     /*****************
      *   Functions   *
diff --git a/src/lib/ranges/range_types/classic_range.cc b/src/lib/ranges/range_types/classic_range.cc
index 7641e24..97038bb 100644
--- a/src/lib/ranges/range_types/classic_range.cc
+++ b/src/lib/ranges/range_types/classic_range.cc
@@ -64,6 +64,7 @@ namespace MultiArrayTools
     }
 
     // put this in the interface class !!!
+    /*
     std::shared_ptr<VIWB> SingleRange<size_t,SpaceType::NONE>::index() const
     {
 	typedef IndexWrapper<IndexType> IW;
@@ -72,6 +73,6 @@ namespace MultiArrayTools
 	      ( std::dynamic_pointer_cast<SingleRange<size_t,SpaceType::NONE> >
 		( std::shared_ptr<RangeBase>( RB::mThis ) ) ) );
     }
-
+    */
 }
 
diff --git a/src/lib/ranges/range_types/spin_range.cc b/src/lib/ranges/range_types/spin_range.cc
index cdc8f5f..83b0e55 100644
--- a/src/lib/ranges/range_types/spin_range.cc
+++ b/src/lib/ranges/range_types/spin_range.cc
@@ -62,6 +62,7 @@ namespace MultiArrayTools
     }
 
     // put this in the interface class !!!
+    /*
     std::shared_ptr<VIWB> SingleRange<size_t,SpaceType::SPIN>::index() const
     {
 	typedef IndexWrapper<IndexType> IW;
@@ -70,6 +71,6 @@ namespace MultiArrayTools
 	      ( std::dynamic_pointer_cast<SingleRange<size_t,SpaceType::SPIN> >
 		( std::shared_ptr<RangeBase>( RB::mThis ) ) ) );
     }
-
+    */
 }
 
diff --git a/src/tests/op_perf_test.cc b/src/tests/op_perf_test.cc
index ab100d9..b08775e 100644
--- a/src/tests/op_perf_test.cc
+++ b/src/tests/op_perf_test.cc
@@ -162,12 +162,10 @@ namespace {
 	auto gamma = MAT::getIndex<SR>();
 	auto delta = MAT::getIndex<SR>();
 	auto deltap = MAT::getIndex<SR>();
-	auto vdeltap = MAT::make_viwb(deltap);
 	
 	auto mix = MAT::mkMIndex( alpha, beta, gamma );
 
 	std::clock_t begin = std::clock();
-	//res1(delta, deltap).set(vdeltap) = ma(delta, alpha, alpha, beta, beta, gamma, gamma, deltap).c(mix);
 	for(size_t i = 0; i != 1000; ++i){
 	    res1(delta, deltap) = ma(delta, alpha, alpha, beta, beta, gamma, gamma, deltap).c(mix);
 	}
diff --git a/src/tests/op_unit_test.cc b/src/tests/op_unit_test.cc
index 394de0f..83b6e04 100644
--- a/src/tests/op_unit_test.cc
+++ b/src/tests/op_unit_test.cc
@@ -215,12 +215,10 @@ namespace {
 	auto gamma = MAT::getIndex<SR>();
 	auto delta = MAT::getIndex<SR>();
 	auto deltap = MAT::getIndex<SR>();
-	auto vdeltap = MAT::make_viwb(deltap);
 	
 	auto mix = MAT::mkMIndex( alpha, beta, gamma );
 
 	std::clock_t begin = std::clock();
-	//res1(delta, deltap).set(vdeltap) = ma(delta, alpha, alpha, beta, beta, gamma, gamma, deltap).c(mix);
 	res1(delta, deltap) = ma(delta, alpha, alpha, beta, beta, gamma, gamma, deltap).c(mix);
 	std::clock_t end = std::clock();
 	std::cout << "MultiArray time: " << static_cast<double>( end - begin ) / CLOCKS_PER_SEC