X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Data%2FParam%2FTFVec.hs;h=87838930a20542d6d5d5682df6a26b8ec525dd71;hb=25576fe76b567e77c0778d2cbb0f952a5d5a50e0;hp=dbe46e97934e73a1c22c3496491ae9aa11fd40c8;hpb=7533cdf220a6bafd6ade70b6cfba9faddb65affa;p=matthijs%2Fmaster-project%2Fsupport%2Ftfvec.git

diff --git a/Data/Param/TFVec.hs b/Data/Param/TFVec.hs
index dbe46e9..8783893 100644
--- a/Data/Param/TFVec.hs
+++ b/Data/Param/TFVec.hs
@@ -35,7 +35,6 @@ module Data.Param.TFVec
   , take
   , drop
   , select
---  , group
   , (<+)
   , (++)
   , map
@@ -53,6 +52,7 @@ module Data.Param.TFVec
   , iterate
   , generate
   , copy
+  , copyn
   ) where
     
 
@@ -174,13 +174,6 @@ select f s n = liftV (select' f' s' n')
           | otherwise = []
         selectFirst0 _ 0 [] = []
 
--- group :: PositiveT n => n -> TFVec s a -> TFVec (Div s n) (TFVec n a)
--- group n = liftV (group' (fromIntegerT n))
---   where group' :: Int -> [a] -> [TFVec s a]
---         group' n xs = case splitAtM n xs of
---                         Nothing -> []
---                         Just (ls, rs) -> TFVec ls : group' n rs
-
 (<+) :: TFVec s a -> a -> TFVec (Succ s) a
 (<+) (TFVec xs) x = TFVec (xs P.++ [x])
 
@@ -216,11 +209,18 @@ shiftr :: (PositiveT s, NaturalT n, n ~ Pred s, s ~ Succ n) =>
           TFVec s a -> a -> TFVec s a
 shiftr xs x = tail xs <+ x
   
-rotl :: (PositiveT s, s ~ Succ (Pred s)) => TFVec s a -> TFVec s a
-rotl xs = last xs +> init xs
-
-rotr :: (PositiveT s, s ~ Succ (Pred s)) => TFVec s a -> TFVec s a
-rotr xs = tail xs <+ head xs
+rotl :: forall s a . NaturalT s => TFVec s a -> TFVec s a
+rotl = liftV rotl'
+  where vlen = fromIntegerT (undefined :: s)
+        rotl' [] = []
+        rotl' xs = let (i,[l]) = splitAt (vlen - 1) xs
+                   in l : i 
+
+rotr :: NaturalT s => TFVec s a -> TFVec s a
+rotr = liftV rotr'
+  where
+    rotr' [] = []
+    rotr' (x:xs) = xs P.++ [x] 
 
 concat :: TFVec s1 (TFVec s2 a) -> TFVec (s1 :*: s2) a
 concat = liftV (P.foldr ((P.++).unTFVec) [])
@@ -234,8 +234,11 @@ iterate s f x = let s' = fromIntegerT s in TFVec (P.take s' $ P.iterate f x)
 generate :: NaturalT s => s -> (a -> a) -> a -> TFVec s a
 generate s f x = let s' = fromIntegerT s in TFVec (P.take s' $ P.tail $ P.iterate f x)
 
-copy :: NaturalT s => s -> a -> TFVec s a
-copy s x = iterate s id x
+copy :: NaturalT s => a -> TFVec s a
+copy x = copyn (undefined :: s) x
+
+copyn :: NaturalT s => s -> a -> TFVec s a
+copyn s x = iterate s id x
 
 -- =============
 -- = Instances =