From 6c320f731fa7a8153fe602b21fbe0fd60969cdf1 Mon Sep 17 00:00:00 2001
From: Alberto Ruiz <aruiz@um.es>
Date: Wed, 14 May 2014 21:24:36 +0200
Subject: moved zip real

---
 packages/hmatrix/src/Numeric/GSL/Vector.hs    | 14 +--------
 packages/hmatrix/src/Numeric/GSL/gsl-vector.c | 41 ---------------------------
 2 files changed, 1 insertion(+), 54 deletions(-)

(limited to 'packages')

diff --git a/packages/hmatrix/src/Numeric/GSL/Vector.hs b/packages/hmatrix/src/Numeric/GSL/Vector.hs
index 7197924..7b5a617 100644
--- a/packages/hmatrix/src/Numeric/GSL/Vector.hs
+++ b/packages/hmatrix/src/Numeric/GSL/Vector.hs
@@ -30,7 +30,7 @@ import Numeric.Vectorized(
     FunCodeS(..), toScalarR, toScalarF, toScalarC, toScalarQ,
     FunCodeV(..), vectorMapR, vectorMapF,
     FunCodeSV(..), vectorMapValR, vectorMapValF,
-    FunCodeVV(..)
+    FunCodeVV(..), vectorZipR,  vectorZipF
    )
 
 import Data.Complex
@@ -93,24 +93,12 @@ foreign import ccall unsafe "gsl-aux.h mapValQ" c_vectorMapValQ :: CInt -> Ptr (
 
 -------------------------------------------------------------------
 
--- | elementwise operation on real vectors
-vectorZipR :: FunCodeVV -> Vector Double -> Vector Double -> Vector Double
-vectorZipR = vectorZipAux c_vectorZipR
-
-foreign import ccall unsafe "gsl-aux.h zipR" c_vectorZipR :: CInt -> TVVV
-
 -- | elementwise operation on complex vectors
 vectorZipC :: FunCodeVV -> Vector (Complex Double) -> Vector (Complex Double) -> Vector (Complex Double)
 vectorZipC = vectorZipAux c_vectorZipC
 
 foreign import ccall unsafe "gsl-aux.h zipC" c_vectorZipC :: CInt -> TCVCVCV
 
--- | elementwise operation on real vectors
-vectorZipF :: FunCodeVV -> Vector Float -> Vector Float -> Vector Float
-vectorZipF = vectorZipAux c_vectorZipF
-
-foreign import ccall unsafe "gsl-aux.h zipF" c_vectorZipF :: CInt -> TFFF
-
 -- | elementwise operation on complex vectors
 vectorZipQ :: FunCodeVV -> Vector (Complex Float) -> Vector (Complex Float) -> Vector (Complex Float)
 vectorZipQ = vectorZipAux c_vectorZipQ
diff --git a/packages/hmatrix/src/Numeric/GSL/gsl-vector.c b/packages/hmatrix/src/Numeric/GSL/gsl-vector.c
index 99891d4..f00424a 100644
--- a/packages/hmatrix/src/Numeric/GSL/gsl-vector.c
+++ b/packages/hmatrix/src/Numeric/GSL/gsl-vector.c
@@ -290,48 +290,7 @@ int mapValQ(int code, gsl_complex_float* val, KQVEC(x), QVEC(r)) {
 
 #define OPZE(C,msg,E) case C: {DEBUGMSG(msg) for(k=0;k<an;k++) rp[k] = E(ap[k],bp[k]); OK }
 #define OPZV(C,msg,E) case C: {DEBUGMSG(msg) res = E(V(r),V(b)); CHECK(res,res); OK }
-int zipR(int code, KRVEC(a), KRVEC(b), RVEC(r)) {
-    REQUIRES(an == bn && an == rn, BAD_SIZE);
-    int k;
-    switch(code) {
-        OPZE(4,"zipR Pow",pow)
-        OPZE(5,"zipR ATan2",atan2)
-    }
-    KDVVIEW(a);
-    KDVVIEW(b);
-    DVVIEW(r);
-    gsl_vector_memcpy(V(r),V(a));
-    int res;
-    switch(code) {
-        OPZV(0,"zipR Add",gsl_vector_add)
-        OPZV(1,"zipR Sub",gsl_vector_sub)
-        OPZV(2,"zipR Mul",gsl_vector_mul)
-        OPZV(3,"zipR Div",gsl_vector_div)
-        default: ERROR(BAD_CODE);
-    }
-}
-
 
-int zipF(int code, KFVEC(a), KFVEC(b), FVEC(r)) {
-    REQUIRES(an == bn && an == rn, BAD_SIZE);
-    int k;
-    switch(code) {
-        OPZE(4,"zipF Pow",pow)
-        OPZE(5,"zipF ATan2",atan2)
-    }
-    KFVVIEW(a);
-    KFVVIEW(b);
-    FVVIEW(r);
-    gsl_vector_float_memcpy(V(r),V(a));
-    int res;
-    switch(code) {
-        OPZV(0,"zipF Add",gsl_vector_float_add)
-        OPZV(1,"zipF Sub",gsl_vector_float_sub)
-        OPZV(2,"zipF Mul",gsl_vector_float_mul)
-        OPZV(3,"zipF Div",gsl_vector_float_div)
-        default: ERROR(BAD_CODE);
-    }
-}
 
 
 int zipCAux(int code, KGCVEC(a), KGCVEC(b), GCVEC(r)) {
-- 
cgit v1.2.3