rerename minIdx/maxIdx and deprecate vectorMinIdx

2 files changed, 19 insertions, 15 deletions

diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index 62fc8af..bb89506 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -31,6 +31,7 @@ import Data.Packed.Internal
 import Numeric.GSL.Vector
 -- import Data.Packed.ST
 
+
 import Data.Binary
 import Foreign.Storable
 import Control.Monad(replicateM)
@@ -101,13 +102,16 @@ vectorMax = toScalarR Max
 
 vectorMin :: Vector Double -> Double
 vectorMin = toScalarR Min
+-}
 
+{-# DEPRECATED vectorMaxIndex "use minIdx" #-}
 vectorMaxIndex :: Vector Double -> Int
 vectorMaxIndex = round . toScalarR MaxIdx
 
+{-# DEPRECATED vectorMinIndex "use maxIdx" #-}
 vectorMinIndex :: Vector Double -> Int
 vectorMinIndex = round . toScalarR MinIdx
--}
+
 
 {- | creates a vector with a given number of equal components:
 
diff --git a/lib/Numeric/LinearAlgebra/Linear.hs b/lib/Numeric/LinearAlgebra/Linear.hs
index e817642..aed6a2b 100644
--- a/lib/Numeric/LinearAlgebra/Linear.hs
+++ b/lib/Numeric/LinearAlgebra/Linear.hs
@@ -34,8 +34,8 @@ class Num e => Vectors a e where
     absSum    :: a e -> e
     vectorMin :: a e -> e
     vectorMax :: a e -> e
-    vectorMinIndex :: a e -> Int
-    vectorMaxIndex :: a e -> Int
+    minIdx    :: a e -> Int
+    maxIdx    :: a e -> Int
     dot       :: a e -> a e -> e
 
 instance Vectors Vector Float where
@@ -44,8 +44,8 @@ instance Vectors Vector Float where
     absSum    = toScalarF AbsSum
     vectorMin = toScalarF Min
     vectorMax = toScalarF Max
-    vectorMinIndex = round . toScalarF MinIdx
-    vectorMaxIndex = round . toScalarF MaxIdx
+    minIdx    = round . toScalarF MinIdx
+    maxIdx    = round . toScalarF MaxIdx
     dot       = dotF
 
 instance Vectors Vector Double where
@@ -54,28 +54,28 @@ instance Vectors Vector Double where
     absSum    = toScalarR AbsSum
     vectorMin = toScalarR Min
     vectorMax = toScalarR Max
-    vectorMinIndex = round . toScalarR MinIdx
-    vectorMaxIndex = round . toScalarR MaxIdx
+    minIdx    = round . toScalarR MinIdx
+    maxIdx    = round . toScalarR MaxIdx
     dot       = dotR
 
 instance Vectors Vector (Complex Float) where
     vectorSum = sumQ
     euclidean = (:+ 0) . toScalarQ Norm2
     absSum    = (:+ 0) . toScalarQ AbsSum
-    vectorMin = ap (@>) vectorMinIndex
-    vectorMax = ap (@>) vectorMaxIndex
-    vectorMinIndex = vectorMinIndex . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
-    vectorMaxIndex = vectorMaxIndex . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
+    vectorMin = ap (@>) minIdx
+    vectorMax = ap (@>) maxIdx
+    minIdx    = minIdx . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
+    maxIdx    = maxIdx . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
     dot       = dotQ
 
 instance Vectors Vector (Complex Double) where
     vectorSum  = sumC
     euclidean = (:+ 0) . toScalarC Norm2
     absSum    = (:+ 0) . toScalarC AbsSum
-    vectorMin = ap (@>) vectorMinIndex
-    vectorMax = ap (@>) vectorMaxIndex
-    vectorMinIndex = vectorMinIndex . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
-    vectorMaxIndex = vectorMaxIndex . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
+    vectorMin = ap (@>) minIdx
+    vectorMax = ap (@>) maxIdx
+    minIdx    = minIdx . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
+    maxIdx    = maxIdx . fst . fromComplex . (zipVector (*) `ap` mapVector conjugate)
     dot       = dotC
 
 ----------------------------------------------------