improve unzipVectorWith arguments

2 files changed, 7 insertions, 6 deletions

diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index c73ef10..7dd1289 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -322,8 +322,8 @@ zipVector f u v = unsafePerformIO $ do
 
 -- | unzipWith for Vectors
 unzipVectorWith :: (Storable (a,b), Storable c, Storable d) 
-                   => (a -> c) -> (b -> d) -> Vector (a,b) -> (Vector c,Vector d)
-unzipVectorWith f g u = unsafePerformIO $ do
+                   => ((a,b) -> (c,d)) -> Vector (a,b) -> (Vector c,Vector d)
+unzipVectorWith f u = unsafePerformIO $ do
       let n = dim u
       v <- createVector n
       w <- createVector n
@@ -331,9 +331,10 @@ unzipVectorWith f g u = unsafePerformIO $ do
           unsafeWith v $ \pv ->
               unsafeWith w $ \pw -> do
                   let go (-1) = return ()
-                      go !k   = do (x,y) <- peekElemOff pu k
-                                   pokeElemOff          pv k (f x)
-                                   pokeElemOff          pw k (g y)
+                      go !k   = do z <- peekElemOff pu k
+                                   let (x,y) = f z 
+                                   pokeElemOff      pv k x
+                                   pokeElemOff      pw k y
                                    go (k-1)
                   go (n-1)
       return (v,w)
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index 760f724..40dd6b5 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -152,6 +152,6 @@ vecdisp f v
 
 -- | unzip for Vectors
 unzipVector :: (Storable a, Storable b, Storable (a,b)) => Vector (a,b) -> (Vector a,Vector b)
-unzipVector = unzipVectorWith id id
+unzipVector = unzipVectorWith id