moved sum

3 files changed, 7 insertions, 127 deletions

diff --git a/packages/base/src/C/vector-aux.c b/packages/base/src/C/vector-aux.c
index 07ccf76..31053ab 100644
--- a/packages/base/src/C/vector-aux.c
+++ b/packages/base/src/C/vector-aux.c
@@ -43,7 +43,6 @@
 
 int sumF(KFVEC(x),FVEC(r)) {
     DEBUGMSG("sumF");
-    printf("hello!\n");
     REQUIRES(rn==1,BAD_SIZE);
     int i;
     float res = 0;
diff --git a/packages/hmatrix/src/Numeric/GSL/Vector.hs b/packages/hmatrix/src/Numeric/GSL/Vector.hs
index 3591289..33bd778 100644
--- a/packages/hmatrix/src/Numeric/GSL/Vector.hs
+++ b/packages/hmatrix/src/Numeric/GSL/Vector.hs
@@ -24,6 +24,13 @@ module Numeric.GSL.Vector (
 
 import Data.Packed
 import Numeric.GSL.Internal hiding (TV,TM,TCV,TCM)
+import Numeric.Vectorized(
+    sumF, sumR, sumQ, sumC,
+    FunCodeS(..),
+    FunCodeV(..),
+    FunCodeSV(..),
+    FunCodeVV(..)
+   )
 
 import Data.Complex
 import Foreign.Marshal.Alloc(free)
@@ -36,84 +43,8 @@ import Control.Monad(when)
 
 fromei x = fromIntegral (fromEnum x) :: CInt
 
-data FunCodeV = Sin
-              | Cos
-              | Tan
-              | Abs
-              | ASin
-              | ACos
-              | ATan
-              | Sinh
-              | Cosh
-              | Tanh
-              | ASinh
-              | ACosh
-              | ATanh
-              | Exp
-              | Log
-              | Sign
-              | Sqrt
-              deriving Enum
-
-data FunCodeSV = Scale
-               | Recip
-               | AddConstant
-               | Negate
-               | PowSV
-               | PowVS
-               deriving Enum
-
-data FunCodeVV = Add
-               | Sub
-               | Mul
-               | Div
-               | Pow
-               | ATan2
-               deriving Enum
-
-data FunCodeS = Norm2
-              | AbsSum
-              | MaxIdx
-              | Max
-              | MinIdx
-              | Min
-              deriving Enum
-
 ------------------------------------------------------------------
 
--- | sum of elements
-sumF :: Vector Float -> Float
-sumF x = unsafePerformIO $ do
-           r <- createVector 1
-           app2 c_sumF vec x vec r "sumF"
-           return $ r @> 0
-
--- | sum of elements
-sumR :: Vector Double -> Double
-sumR x = unsafePerformIO $ do
-           r <- createVector 1
-           app2 c_sumR vec x vec r "sumR"
-           return $ r @> 0
-
--- | sum of elements
-sumQ :: Vector (Complex Float) -> Complex Float
-sumQ x = unsafePerformIO $ do
-           r <- createVector 1
-           app2 c_sumQ vec x vec r "sumQ"
-           return $ r @> 0
-
--- | sum of elements
-sumC :: Vector (Complex Double) -> Complex Double
-sumC x = unsafePerformIO $ do
-           r <- createVector 1
-           app2 c_sumC vec x vec r "sumC"
-           return $ r @> 0
-
-foreign import ccall unsafe "gsl-aux.h sumF" c_sumF :: TFF
-foreign import ccall unsafe "gsl-aux.h sumR" c_sumR :: TVV
-foreign import ccall unsafe "gsl-aux.h sumQ" c_sumQ :: TQVQV
-foreign import ccall unsafe "gsl-aux.h sumC" c_sumC :: TCVCV
-
 -- | product of elements
 prodF :: Vector Float -> Float
 prodF x = unsafePerformIO $ do
diff --git a/packages/hmatrix/src/Numeric/GSL/gsl-vector.c b/packages/hmatrix/src/Numeric/GSL/gsl-vector.c
index 40a086a..3c2db4d 100644
--- a/packages/hmatrix/src/Numeric/GSL/gsl-vector.c
+++ b/packages/hmatrix/src/Numeric/GSL/gsl-vector.c
@@ -88,56 +88,6 @@
 #define BAD_FILE 2003
 
 
-int sumF(KFVEC(x),FVEC(r)) {
-    DEBUGMSG("sumF");
-    REQUIRES(rn==1,BAD_SIZE);
-    int i;
-    float res = 0;
-    for (i = 0; i < xn; i++) res += xp[i];
-    rp[0] = res;
-    OK
-}
-    
-int sumR(KRVEC(x),RVEC(r)) {
-    DEBUGMSG("sumR");
-    REQUIRES(rn==1,BAD_SIZE);
-    int i;
-    double res = 0;
-    for (i = 0; i < xn; i++) res += xp[i];
-    rp[0] = res;
-    OK
-}
-    
-int sumQ(KQVEC(x),QVEC(r)) {
-    DEBUGMSG("sumQ");
-    REQUIRES(rn==1,BAD_SIZE);
-    int i;
-    gsl_complex_float res;
-    res.dat[0] = 0;
-    res.dat[1] = 0;
-    for (i = 0; i < xn; i++) {
-      res.dat[0] += xp[i].dat[0];
-      res.dat[1] += xp[i].dat[1];
-    }
-    rp[0] = res;
-    OK
-}
-    
-int sumC(KCVEC(x),CVEC(r)) {
-    DEBUGMSG("sumC");
-    REQUIRES(rn==1,BAD_SIZE);
-    int i;
-    gsl_complex res;
-    res.dat[0] = 0;
-    res.dat[1] = 0;
-    for (i = 0; i < xn; i++)  {
-      res.dat[0] += xp[i].dat[0];
-      res.dat[1] += xp[i].dat[1];
-    }
-    rp[0] = res;
-    OK
-}
-
 int prodF(KFVEC(x),FVEC(r)) {
     DEBUGMSG("prodF");
     REQUIRES(rn==1,BAD_SIZE);