From 7533cdf220a6bafd6ade70b6cfba9faddb65affa Mon Sep 17 00:00:00 2001
From: Christiaan Baaij
Date: Fri, 26 Jun 2009 14:45:19 +0200
Subject: [PATCH 1/1] Removed 'group' - Div type family is not instanced for
Decimals Updated 'rotr' to look like 'rotl'
---
Data/Param/TFVec.hs | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/Data/Param/TFVec.hs b/Data/Param/TFVec.hs
index 673d69b..dbe46e9 100644
--- a/Data/Param/TFVec.hs
+++ b/Data/Param/TFVec.hs
@@ -35,7 +35,7 @@ module Data.Param.TFVec
, take
, drop
, select
- , group
+-- , group
, (<+)
, (++)
, map
@@ -82,7 +82,6 @@ deriving instance (NaturalT s, Typeable s, Data s, Typeable a, Data a) => Data (
empty :: TFVec D0 a
empty = TFVec []
-{-# NOINLINE (+>) #-}
(+>) :: a -> TFVec s a -> TFVec (Succ s) a
x +> (TFVec xs) = TFVec (x:xs)
@@ -175,12 +174,12 @@ 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
+-- 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])
@@ -220,9 +219,8 @@ 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
-class Rotr a where rotr :: a -> a
-instance Rotr (TFVec D0 a) where rotr xs = xs
-instance (PositiveT s, s ~ Succ (Pred s)) => Rotr (TFVec s a) where rotr xs = tail xs <+ head xs
+rotr :: (PositiveT s, s ~ Succ (Pred s)) => TFVec s a -> TFVec s a
+rotr xs = tail xs <+ head xs
concat :: TFVec s1 (TFVec s2 a) -> TFVec (s1 :*: s2) a
concat = liftV (P.foldr ((P.++).unTFVec) [])
--
2.30.2