table, splitEvery

3 files changed, 22 insertions, 18 deletions

diff --git a/lib/Data/Packed/Internal/Common.hs b/lib/Data/Packed/Internal/Common.hs
index 972cd7d..bfa63f1 100644
--- a/lib/Data/Packed/Internal/Common.hs
+++ b/lib/Data/Packed/Internal/Common.hs
@@ -18,8 +18,9 @@ module Data.Packed.Internal.Common(
   Adapt,
   app1, app2, app3, app4,
   (//), check,
-  partit, common, compatdim,
-  fi
+  splitEvery, common, compatdim,
+  fi,
+  table
 ) where
 
 import Foreign
@@ -27,11 +28,12 @@ import Control.Monad(when)
 import Foreign.C.String(peekCString)
 import Foreign.C.Types
 import Foreign.Storable.Complex()
+import Data.List(transpose,intersperse)
 
--- | @partit 3 [1..9] == [[1,2,3],[4,5,6],[7,8,9]]@
-partit :: Int -> [a] -> [[a]]
-partit _ [] = []
-partit n l  = take n l : partit n (drop n l)
+-- | @splitEvery 3 [1..9] == [[1,2,3],[4,5,6],[7,8,9]]@
+splitEvery :: Int -> [a] -> [[a]]
+splitEvery _ [] = []
+splitEvery k l = take k l : splitEvery k (drop k l)
 
 -- | obtains the common value of a property of a list
 common :: (Eq a) => (b->a) -> [b] -> Maybe a
@@ -47,6 +49,15 @@ compatdim [] = Nothing
 compatdim [a] = Just a
 compatdim (a:b:xs) = if a==b || a==1 || b==1 then compatdim (max a b:xs) else Nothing
 
+-- | Formatting tool
+table :: String -> [[String]] -> String
+table sep as = unlines . map unwords' $ transpose mtp where 
+    mt = transpose as
+    longs = map (maximum . map length) mt
+    mtp = zipWith (\a b -> map (pad a) b) longs mt
+    pad n str = replicate (n - length str) ' ' ++ str
+    unwords' = concat . intersperse sep
+
 -- | postfix function application (@flip ($)@)
 (//) :: x -> (x -> y) -> y
 infixl 0 //
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 8bd6fb2..a6b6215 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -139,7 +139,7 @@ type Mt t s = Int -> Int -> Ptr t -> s
 
 -- | the inverse of 'Data.Packed.Matrix.fromLists'
 toLists :: (Element t) => Matrix t -> [[t]]
-toLists m = partit (cols m) . toList . flatten $ m
+toLists m = splitEvery (cols m) . toList . flatten $ m
 
 -- | Create a matrix from a list of vectors.
 -- All vectors must have the same dimension,
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 66e5082..a8e998f 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -36,10 +36,10 @@ module Data.Packed.Matrix (
 import Data.Packed.Internal
 import qualified Data.Packed.ST as ST
 import Data.Packed.Vector
-import Data.List(transpose,intersperse)
 import Data.Array
 import System.Process(readProcess)
 import Text.Printf(printf)
+import Data.List(transpose)
 
 -- | creates a matrix from a vertical list of matrices
 joinVert :: Element t => [Matrix t] -> Matrix t
@@ -85,7 +85,7 @@ adaptBlocks ms = ms' where
     rs = map (compatdim . map rows) ms
     cs = map (compatdim . map cols) (transpose ms)
     szs = sequence [rs,cs]
-    ms' = partit bc $ zipWith g szs (concat ms)
+    ms' = splitEvery bc $ zipWith g szs (concat ms)
 
     g [Just nr,Just nc] m
                 | nr == r && nc == c = m
@@ -249,13 +249,6 @@ shfc n z@ (a:+b)
 
 -}
 
-dsp' :: String -> [[String]] -> String
-dsp' sep as = unlines . map unwords' $ transpose mtp where 
-    mt = transpose as
-    longs = map (maximum . map length) mt
-    mtp = zipWith (\a b -> map (pad a) b) longs mt
-    pad n str = replicate (n - length str) ' ' ++ str
-    unwords' = concat . intersperse sep
 
 {- | Creates a string from a matrix given a separator and a function to show each entry. Using
 this function the user can easily define any desired display function:
@@ -266,7 +259,7 @@ this function the user can easily define any desired display function:
 
 -}
 format :: (Element t) => String -> (t -> String) -> Matrix t -> String
-format sep f m = dsp' sep . map (map f) . toLists $ m
+format sep f m = table sep . map (map f) . toLists $ m
 
 {-
 disp m f = putStrLn $ "matrix ("++show (rows m) ++"x"++ show (cols m) ++")\n"++format " | " f m
@@ -385,7 +378,7 @@ extractRows l m = fromRows $ extract (toRows $ m) l
 
 -}
 repmat :: (Element t) => Matrix t -> Int -> Int -> Matrix t
-repmat m r c = fromBlocks $ partit c $ replicate (r*c) m
+repmat m r c = fromBlocks $ splitEvery c $ replicate (r*c) m
 
 -- | A version of 'liftMatrix2' which automatically adapt matrices with a single row or column to match the dimensions of the other matrix.
 liftMatrix2Auto :: (Element t, Element a, Element b)