[mrs]{from,to}ListLinear

4 files changed, 23 insertions, 0 deletions

diff --git a/src/Data/Array/Nested.hs b/src/Data/Array/Nested.hs
index 911a525..15ea105 100644
--- a/src/Data/Array/Nested.hs
+++ b/src/Data/Array/Nested.hs
@@ -10,6 +10,7 @@ module Data.Array.Nested (
   rtranspose, rappend, rconcat, rscalar, rfromVector, rtoVector, runScalar,
   rrerank,
   rreplicate, rreplicateScal, rfromListOuter, rfromList1, rfromList1Prim, rtoListOuter, rtoList1,
+  rfromListLinear, rtoListLinear,
   rslice, rrev1, rreshape, rflatten, riota,
   rminIndexPrim, rmaxIndexPrim, rdot, rdot1,
   rnest, runNest,
@@ -30,6 +31,7 @@ module Data.Array.Nested (
   -- TODO: sconcat? What should its type be?
   srerank,
   sreplicate, sreplicateScal, sfromListOuter, sfromList1, sfromList1Prim, stoListOuter, stoList1,
+  sfromListLinear, stoListLinear,
   sslice, srev1, sreshape, sflatten, siota,
   sminIndexPrim, smaxIndexPrim, sdot, sdot1,
   snest, sunNest,
@@ -48,6 +50,7 @@ module Data.Array.Nested (
   mtranspose, mappend, mconcat, mscalar, mfromVector, mtoVector, munScalar,
   mrerank,
   mreplicate, mreplicateScal, mfromListOuter, mfromList1, mfromList1Prim, mtoListOuter, mtoList1,
+  mfromListLinear, mtoListLinear,
   mslice, mrev1, mreshape, mflatten, miota,
   mminIndexPrim, mmaxIndexPrim, mdot, mdot1,
   mnest, munNest,
diff --git a/src/Data/Array/Nested/Internal/Mixed.hs b/src/Data/Array/Nested/Internal/Mixed.hs
index 8421372..d548794 100644
--- a/src/Data/Array/Nested/Internal/Mixed.hs
+++ b/src/Data/Array/Nested/Internal/Mixed.hs
@@ -742,6 +742,14 @@ mfromListPrimLinear sh l =
   let M_Primitive _ xarr = toPrimitive (mfromListPrim l)
   in fromPrimitive $ M_Primitive sh (X.reshape (SUnknown () :!% ZKX) sh xarr)
 
+-- This forall is there so that a simple type application can constrain the
+-- shape, in case the user wants to use OverloadedLists for the shape.
+mfromListLinear :: forall sh a. Elt a => IShX sh -> NonEmpty a -> Mixed sh a
+mfromListLinear sh l = mreshape sh (mfromList1 l)
+
+mtoListLinear :: Elt a => Mixed sh a -> [a]
+mtoListLinear arr = map (mindex arr) (shxEnum (mshape arr))  -- TODO: optimise
+
 munScalar :: Elt a => Mixed '[] a -> a
 munScalar arr = mindex arr ZIX
 
diff --git a/src/Data/Array/Nested/Internal/Ranked.hs b/src/Data/Array/Nested/Internal/Ranked.hs
index 306acc0..98014b0 100644
--- a/src/Data/Array/Nested/Internal/Ranked.hs
+++ b/src/Data/Array/Nested/Internal/Ranked.hs
@@ -348,6 +348,12 @@ rfromListPrimLinear sh l =
   let M_Primitive _ xarr = toPrimitive (mfromListPrim l)
   in Ranked $ fromPrimitive $ M_Primitive (shCvtRX sh) (X.reshape (SUnknown () :!% ZKX) (shCvtRX sh) xarr)
 
+rfromListLinear :: forall n a. Elt a => IShR n -> NonEmpty a -> Ranked n a
+rfromListLinear sh l = rreshape sh (rfromList1 l)
+
+rtoListLinear :: Elt a => Ranked n a -> [a]
+rtoListLinear (Ranked arr) = mtoListLinear arr
+
 rfromOrthotope :: PrimElt a => SNat n -> S.Array n a -> Ranked n a
 rfromOrthotope sn arr
   | Refl <- lemRankReplicate sn
diff --git a/src/Data/Array/Nested/Internal/Shaped.hs b/src/Data/Array/Nested/Internal/Shaped.hs
index 9588017..9abce4f 100644
--- a/src/Data/Array/Nested/Internal/Shaped.hs
+++ b/src/Data/Array/Nested/Internal/Shaped.hs
@@ -327,6 +327,12 @@ sfromListPrimLinear sh l =
   let M_Primitive _ xarr = toPrimitive (mfromListPrim l)
   in Shaped $ fromPrimitive $ M_Primitive (shCvtSX sh) (X.reshape (SUnknown () :!% ZKX) (shCvtSX sh) xarr)
 
+sfromListLinear :: forall sh a. Elt a => ShS sh -> NonEmpty a -> Shaped sh a
+sfromListLinear sh l = Shaped (mfromListLinear (shCvtSX sh) l)
+
+stoListLinear :: Elt a => Shaped sh a -> [a]
+stoListLinear (Shaped arr) = mtoListLinear arr
+
 sfromOrthotope :: PrimElt a => ShS sh -> SS.Array sh a -> Shaped sh a
 sfromOrthotope sh (SS.A (SG.A arr)) =
   Shaped (fromPrimitive (M_Primitive (shCvtSX sh) (X.XArray (RS.A (RG.A (shsToList sh) arr)))))