added Vectors typeclass and refactored

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/Data/Packed/Internal/Signatures.hs b/lib/Data/Packed/Internal/Signatures.hs
index 4d984e3..1370dbc 100644
--- a/lib/Data/Packed/Internal/Signatures.hs
+++ b/lib/Data/Packed/Internal/Signatures.hs
@@ -20,6 +20,7 @@ import Foreign.C.Types
 
 type PF = Ptr Float                             --
 type PD = Ptr Double                            --
+type PQ = Ptr (Complex Float)                   --
 type PC = Ptr (Complex Double)                  --
 type TF = CInt -> PF -> IO CInt                 --
 type TFF = CInt -> PF -> TF                     --
@@ -53,6 +54,9 @@ type TCMCMCM = CInt -> CInt -> PC -> TCMCM      --
 type TCV = CInt -> PC -> IO CInt                --
 type TCVCV = CInt -> PC -> TCV                  --
 type TCVCVCV = CInt -> PC -> TCVCV              --
+type TQV = CInt -> PQ -> IO CInt                --
+type TQVQV = CInt -> PQ -> TQV                  --
+type TQVQVQV = CInt -> PQ -> TQVQV              --
 type TCMCV = CInt -> CInt -> PC -> TCV          --
 type TVCV = CInt -> PD -> TCV                   --
 type TCVM = CInt -> PC -> TM                    --
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index 4f25b6f..62fc8af 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -19,8 +19,9 @@ module Data.Packed.Vector (
     subVector, takesV, join,
     constant, linspace,
     vecdisp,
-    vectorFMax, vectorFMin, vectorFMaxIndex, vectorFMinIndex,
-    vectorMax, vectorMin, vectorMaxIndex, vectorMinIndex,
+--    moved to Numeric.LinearAlgebra.Interface typeclass
+--    vectorFMax, vectorFMin, vectorFMaxIndex, vectorFMinIndex,
+--    vectorMax, vectorMin, vectorMaxIndex, vectorMinIndex,
     mapVector, zipVector,
     fscanfVector, fprintfVector, freadVector, fwriteVector,
     foldLoop, foldVector, foldVectorG
@@ -82,6 +83,7 @@ linspace n (a,b) = add a $ scale s  $ fromList [0 .. fromIntegral n-1]
           add   = vectorMapValR AddConstant
           s = (b-a)/fromIntegral (n-1)
 
+{-
 vectorFMax :: Vector Float -> Float
 vectorFMax = toScalarF Max
 
@@ -105,6 +107,7 @@ vectorMaxIndex = round . toScalarR MaxIdx
 
 vectorMinIndex :: Vector Double -> Int
 vectorMinIndex = round . toScalarR MinIdx
+-}
 
 {- | creates a vector with a given number of equal components: