fix zipVector name to zipVectorWith

3 files changed, 13 insertions, 9 deletions

diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index c8cc2c2..be2fcbb 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -17,7 +17,7 @@ module Data.Packed.Internal.Vector (
     Vector, dim,
     fromList, toList, (|>),
     join, (@>), safe, at, at', subVector, takesV,
-    mapVector, zipVector, unzipVectorWith,
+    mapVector, zipVectorWith, unzipVectorWith,
     mapVectorM, mapVectorM_,
     foldVector, foldVectorG, foldLoop,
     createVector, vec,
@@ -319,8 +319,8 @@ mapVector f v = unsafePerformIO $ do
 {-# INLINE mapVector #-}
 
 -- | zipWith for Vectors
-zipVector :: (Storable a, Storable b, Storable c) => (a-> b -> c) -> Vector a -> Vector b -> Vector c
-zipVector f u v = unsafePerformIO $ do
+zipVectorWith :: (Storable a, Storable b, Storable c) => (a-> b -> c) -> Vector a -> Vector b -> Vector c
+zipVectorWith f u v = unsafePerformIO $ do
     let n = min (dim u) (dim v)
     w <- createVector n
     unsafeWith u $ \pu ->
@@ -333,7 +333,7 @@ zipVector f u v = unsafePerformIO $ do
                                go (k-1)
                 go (n -1)
     return w
-{-# INLINE zipVector #-}
+{-# INLINE zipVectorWith #-}
 
 -- | unzipWith for Vectors
 unzipVectorWith :: (Storable (a,b), Storable c, Storable d) 
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index 81dfa37..a526caa 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -26,7 +26,7 @@ module Data.Packed.Vector (
 --    vectorFMax, vectorFMin, vectorFMaxIndex, vectorFMinIndex,
 --    vectorMax, vectorMin,
     vectorMaxIndex, vectorMinIndex,
-    mapVector, zipVector, unzipVector, unzipVectorWith,
+    mapVector, zipVector, zipVectorWith, unzipVector, unzipVectorWith,
     mapVectorM, mapVectorM_,
     fscanfVector, fprintfVector, freadVector, fwriteVector,
     foldLoop, foldVector, foldVectorG
@@ -114,6 +114,10 @@ buildVector len f =
     fromList $ map f [0 .. (len - 1)]
 
 
+-- | zip for Vectors
+zipVector :: (Storable a, Storable b, Storable (a,b)) => Vector a -> Vector b -> Vector (a,b)
+zipVector = zipVectorWith (,)
+
 -- | unzip for Vectors
 unzipVector :: (Storable a, Storable b, Storable (a,b)) => Vector (a,b) -> (Vector a,Vector b)
 unzipVector = unzipVectorWith id
diff --git a/lib/Numeric/LinearAlgebra/Linear.hs b/lib/Numeric/LinearAlgebra/Linear.hs
index ae48245..71869cb 100644
--- a/lib/Numeric/LinearAlgebra/Linear.hs
+++ b/lib/Numeric/LinearAlgebra/Linear.hs
@@ -73,8 +73,8 @@ instance Vectors Vector (Complex Float) where
     absSum    = (:+ 0) . toScalarQ AbsSum
     vectorMin = ap (@>) minIdx
     vectorMax = ap (@>) maxIdx
-    minIdx    = minIdx . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
-    maxIdx    = maxIdx . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
+    minIdx    = minIdx . fst . fromComplex . (zipVectorWith (*) `ap` mapVector conjugate)
+    maxIdx    = maxIdx . fst . fromComplex . (zipVectorWith (*) `ap` mapVector conjugate)
     dot       = dotQ
 
 instance Vectors Vector (Complex Double) where
@@ -83,8 +83,8 @@ instance Vectors Vector (Complex Double) where
     absSum    = (:+ 0) . toScalarC AbsSum
     vectorMin = ap (@>) minIdx
     vectorMax = ap (@>) maxIdx
-    minIdx    = minIdx . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
-    maxIdx    = maxIdx . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
+    minIdx    = minIdx . fst . fromComplex . (zipVectorWith (*) `ap` mapVector conjugate)
+    maxIdx    = maxIdx . fst . fromComplex . (zipVectorWith (*) `ap` mapVector conjugate)
     dot       = dotC
 
 ----------------------------------------------------