conj using mapVector

4 files changed, 2 insertions, 21 deletions

diff --git a/examples/benchmarks.hs b/examples/benchmarks.hs
index 0e95851..bffa221 100644
--- a/examples/benchmarks.hs
+++ b/examples/benchmarks.hs
@@ -45,6 +45,7 @@ bench1 = do
     putStrLn "constant 5M:"
     time $ print $ constant (1::Double) 5000001 @> 7
     time $ print $ constant           i 5000001 @> 7
+    time $ print $ conj (constant i 5000001) @> 7
 
 sumVH v = go (d - 1) 0
      where
@@ -64,7 +65,6 @@ innerH u v = go (d - 1) 0
 -- sumVector = foldVectorG (\k v s -> v k + s) 0.0
 sumVector = foldVector (+) 0.0
 
-
 --------------------------------------------------------------------------------
 
 bench2 = do
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 09f081a..44204a1 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -297,12 +297,7 @@ subMatrix = subMatrixD
 
 -- | obtains the complex conjugate of a complex vector
 conj :: Vector (Complex Double) -> Vector (Complex Double)
-conj v = unsafePerformIO $ do
-    r <- createVector (dim v)
-    app2 cconjugate vec v vec r "cconjugate"
-    return r
-foreign import ccall "auxi.h conjugate" cconjugate :: TCVCV
-
+conj = mapVector conjugate
 
 -- | creates a complex vector from vectors with real and imaginary parts
 toComplex :: (Vector Double, Vector Double) ->  Vector (Complex Double)
diff --git a/lib/Data/Packed/Internal/auxi.c b/lib/Data/Packed/Internal/auxi.c
index 562c804..5c06cb6 100644
--- a/lib/Data/Packed/Internal/auxi.c
+++ b/lib/Data/Packed/Internal/auxi.c
@@ -64,18 +64,6 @@ int submatrixR(int r1, int r2, int c1, int c2, KRMAT(x),RMAT(r)) {
     OK
 }
 
-
-int conjugate(KCVEC(x),CVEC(t)) {
-    REQUIRES(xn==tn,BAD_SIZE);
-    DEBUGMSG("conjugate");
-    int k;
-    for (k=0; k<xn; k++) {
-        tp[k].dat[0] =   xp[k].dat[0];
-        tp[k].dat[1] = - xp[k].dat[1];
-    }
-    OK
-}
-
 //---------------------------------------
 void asm_finit() {
     asm("finit");
diff --git a/lib/Data/Packed/Internal/auxi.h b/lib/Data/Packed/Internal/auxi.h
index e5370b4..c234ef5 100644
--- a/lib/Data/Packed/Internal/auxi.h
+++ b/lib/Data/Packed/Internal/auxi.h
@@ -16,6 +16,4 @@ const char * gsl_strerror (const int gsl_errno);
 
 int matrix_fscanf(char*filename, RMAT(a));
 
-int conjugate(KCVEC(x),CVEC(t));
-
 void asm_finit();