From db6b0a14ec33010e545a145b1bf2c148cf6de1bd Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Mon, 18 Sep 2023 00:01:27 +0200
Subject: [PATCH] WIP: slicing + partial ranges

---
 src/include/array/array_base.cc.h | 10 +++++-----
 src/include/array/array_base.h    |  3 ++-
 src/include/ranges/prange.cc.h    | 17 +++++++++++++++++
 src/include/ranges/prange.h       |  3 +++
 src/include/ranges/range_base.h   |  1 +
 src/include/ranges/yrange.h       |  5 +++++
 src/lib/ranges/yrange.cc          | 14 ++++++++++++++
 7 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/include/array/array_base.cc.h b/src/include/array/array_base.cc.h
index 0856c17..ca38cbf 100644
--- a/src/include/array/array_base.cc.h
+++ b/src/include/array/array_base.cc.h
@@ -64,12 +64,12 @@ namespace CNORXZ
 
     template <typename T>
     template <typename I, typename M>
-    Sptr<CArrayBase<T>> CArrayBase<T>::sl(const IndexInterface<I,M>& i) const
+    Sptr<CArrayBase<T>> CArrayBase<T>::sl(const IndexInterface<I,M>& begin,
+					  const IndexInterface<I,M>& end) const
     {
-	auto beg = std::make_shared<const_iterator>(this->begin());
-	auto si = i.slice(beg);
-	auto it = *beg + i.lex();
-	return std::make_shared<CSlice>(this, *si, it.pos());
+	auto ai = itLexSave(begin);
+	auto aj = itLexSave(end);
+	return std::make_shared<CSlice>(subcube(ai,aj), this, ai.format(), ai.pos());
     }
 
     template <typename T>
diff --git a/src/include/array/array_base.h b/src/include/array/array_base.h
index 55183a9..cdf3c75 100644
--- a/src/include/array/array_base.h
+++ b/src/include/array/array_base.h
@@ -40,7 +40,8 @@ namespace CNORXZ
 	const T& at(const DPack& pack) const;
 
 	template <typename I, typename M>
-	Sptr<CArrayBase<T>> sl(const IndexInterface<I,M>& i) const;
+	Sptr<CArrayBase<T>> sl(const IndexInterface<I,M>& begin,
+			       const IndexInterface<I,M>& end) const;
 
 	template <class Index>
 	COpRoot<T,Index> operator()(const Sptr<Index>& i) const;
diff --git a/src/include/ranges/prange.cc.h b/src/include/ranges/prange.cc.h
index fc478b5..1efae1d 100644
--- a/src/include/ranges/prange.cc.h
+++ b/src/include/ranges/prange.cc.h
@@ -326,6 +326,23 @@ namespace CNORXZ
     {
 	return Vector<Uuid> { mRange->id() };
     }
+
+
+    /****************************
+     *   non-member functions   *
+     ****************************/
+    
+    template <class I, typename M>
+    RangePtr prange(const IndexInterface<I,M>& begin, const IndexInterface<I,M>& end)
+    {
+	Vector<SizeT> parts(end-begin);
+	const SizeT off = begin.pos();
+	for(auto i = begin.THIS(); i != end.THIS(); ++i){
+	    parts[i.pos()-off] = i.pos();
+	}
+	return begin.range()->partial(parts); // implement!!!!
+	//return PRangeFactory<typename I::RangeType>(begin.range(), parts).create();
+    }
 }
 
 #endif
diff --git a/src/include/ranges/prange.h b/src/include/ranges/prange.h
index e1788ea..78961c8 100644
--- a/src/include/ranges/prange.h
+++ b/src/include/ranges/prange.h
@@ -117,6 +117,9 @@ namespace CNORXZ
 	Sptr<RangeT> mRange;
 	Vector<SizeT> mParts;
     };
+
+    template <class I, typename M>
+    RangePtr prange(const IndexInterface<I,M>& begin, const IndexInterface<I,M>& end);
     
 } // namespace CNORXZ
 
diff --git a/src/include/ranges/range_base.h b/src/include/ranges/range_base.h
index 69a1803..4d4002c 100644
--- a/src/include/ranges/range_base.h
+++ b/src/include/ranges/range_base.h
@@ -124,6 +124,7 @@ namespace CNORXZ
 
     RangePtr getSub(const RangePtr& r, SizeT num);
     MArray<RangePtr> getSub(const RangePtr& r);
+    
 }
 
 #endif
diff --git a/src/include/ranges/yrange.h b/src/include/ranges/yrange.h
index f13989c..16b476c 100644
--- a/src/include/ranges/yrange.h
+++ b/src/include/ranges/yrange.h
@@ -9,6 +9,7 @@
 #include "xpr/xpr.h"
 #include "index_format.h"
 #include "index_pack.h"
+#include "prange.h"
 
 namespace CNORXZ
 {
@@ -159,6 +160,10 @@ namespace CNORXZ
 	static Sptr<YRange> func(const RangePtr& r);
     };
 
+    template <>
+    RangePtr prange(const IndexInterface<YIndex,Vector<DType>>& begin,
+		    const IndexInterface<YIndex,Vector<DType>>& end);
+    
 }
 
 #endif
diff --git a/src/lib/ranges/yrange.cc b/src/lib/ranges/yrange.cc
index 45a45dd..082fc22 100644
--- a/src/lib/ranges/yrange.cc
+++ b/src/lib/ranges/yrange.cc
@@ -560,4 +560,18 @@ namespace CNORXZ
     {
 	return std::dynamic_pointer_cast<YRange>( YRangeFactory({r}).create() );
     }
+
+    template <>
+    RangePtr prange(const IndexInterface<YIndex,Vector<DType>>& begin,
+		    const IndexInterface<YIndex,Vector<DType>>& end)
+    {
+	CXZ_WARNING("YRange specialization"); // test
+	const SizeT dim = begin.range()->dim();
+	Vector<RangePtr> v(dim);
+	for(SizeT i = 0; i != dim; ++i){
+	    v[i] = prange( DIndex(begin.THIS().pack()[i]), DIndex(end.THIS().pack()[i]) );
+	}
+	return YRangeFactory(v).create();
+    }
+
 }