Merge pull request #35 from bgamari/master

A few fixes

1 files changed, 15 insertions, 15 deletions

diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index ca96c50..c1a9b24 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -46,7 +46,6 @@ import Data.Array
 
 import Data.List(transpose,intersperse)
 import Foreign.Storable(Storable)
-import Control.Arrow((***))
 
 -------------------------------------------------------------------
 
@@ -158,7 +157,7 @@ adaptBlocks ms = ms' where
 
 -----------------------------------------------------------
 
--- | Reverse rows 
+-- | Reverse rows
 flipud :: Element t => Matrix t -> Matrix t
 flipud m = fromRows . reverse . toRows $ m
 
@@ -273,7 +272,7 @@ Hilbert matrix of order N:
 buildMatrix :: Element a => Int -> Int -> ((Int, Int) -> a) -> Matrix a
 buildMatrix rc cc f =
     fromLists $ map (map f)
-        $ map (\ ri -> map (\ ci -> (ri, ci)) [0 .. (cc - 1)]) [0 .. (rc - 1)]
+        $ map (\ ri -> map (\ ci -> (ri, ci)) [0 .. (cc - 1)]) [0 .. (rc - 1)]
 
 -----------------------------------------------------
 
@@ -284,7 +283,7 @@ fromArray2D m = (r><c) (elems m)
           c = c1-c0+1
 
 
--- | rearranges the rows of a matrix according to the order given in a list of integers. 
+-- | rearranges the rows of a matrix according to the order given in a list of integers.
 extractRows :: Element t => [Int] -> Matrix t -> Matrix t
 extractRows l m = fromRows $ extract (toRows m) l
     where extract l' is = [l'!!i |i<-is]
@@ -352,9 +351,9 @@ toBlocksEvery r c m = toBlocks rs cs m where
 
 -------------------------------------------------------------------
 
-mk c g = \k v -> g ((fromIntegral *** fromIntegral) (divMod k c)) v 
+mk c g = \k v -> g (divMod k c) v
 
-{- | 
+{- |
 
 @ghci> mapMatrixWithIndexM_ (\\(i,j) v -> printf \"m[%.0f,%.0f] = %.f\\n\" i j v :: IO()) ((2><3)[1 :: Double ..])
 m[0,0] = 1
@@ -367,8 +366,8 @@ m[1,2] = 6@
 mapMatrixWithIndexM_
   :: (Element a, Num a,
       Functor f, Monad f) =>
-      ((a, a) -> a -> f ()) -> Matrix a -> f ()
-mapMatrixWithIndexM_ g m = mapVectorWithIndexM_ (mk c g) . flatten $ m 
+      ((Int, Int) -> a -> f ()) -> Matrix a -> f ()
+mapMatrixWithIndexM_ g m = mapVectorWithIndexM_ (mk c g) . flatten $ m
   where
     c = cols m
 
@@ -381,11 +380,11 @@ Just (3><3)
  ,  20.0,  21.0, 122.0 ]@
 -}
 mapMatrixWithIndexM
-  :: (Foreign.Storable.Storable t, 
+  :: (Foreign.Storable.Storable t,
       Element a, Num a,
       Functor f, Monad f) =>
-      ((a, a) -> a -> f t) -> Matrix a -> f (Matrix t)
-mapMatrixWithIndexM g m = fmap (reshape c) . mapVectorWithIndexM (mk c g) . flatten $ m 
+      ((Int, Int) -> a -> f t) -> Matrix a -> f (Matrix t)
+mapMatrixWithIndexM g m = fmap (reshape c) . mapVectorWithIndexM (mk c g) . flatten $ m
     where
       c = cols m
 
@@ -396,11 +395,12 @@ mapMatrixWithIndexM g m = fmap (reshape c) . mapVectorWithIndexM (mk c g) . flat
  ,  10.0, 111.0,  12.0
  ,  20.0,  21.0, 122.0 ]@
  -}
-mapMatrixWithIndex :: (Foreign.Storable.Storable t, 
+mapMatrixWithIndex :: (Foreign.Storable.Storable t,
       Element a, Num a) =>
-      ((a, a) -> a -> t) -> Matrix a -> Matrix t
-mapMatrixWithIndex g = head . mapMatrixWithIndexM (\a b -> [g a b])
+      ((Int, Int) -> a -> t) -> Matrix a -> Matrix t
+mapMatrixWithIndex g m = reshape c $ mapVectorWithIndex (mk c g) $ flatten m
+    where
+      c = cols m
 
 mapMatrix :: (Storable a, Storable b) => (a -> b) -> Matrix a -> Matrix b
 mapMatrix f = liftMatrix (mapVector f)
-