6 files changed, 31 insertions, 70 deletions

diff --git a/lib/Numeric/GSL/Fourier.hs b/lib/Numeric/GSL/Fourier.hs
index 4b08625..149c1e1 100644
--- a/lib/Numeric/GSL/Fourier.hs
+++ b/lib/Numeric/GSL/Fourier.hs
@@ -26,8 +26,7 @@ import Foreign
 
 genfft code v = unsafePerformIO $ do
     r <- createVector (dim v)
-    ww2 withVector v withVector r $ \ v r ->
-        c_fft code // v // r // check "fft"
+    app2 (c_fft code) vec v vec r "fft"
     return r
 
 foreign import ccall "gsl-aux.h fft" c_fft ::  Int -> TCVCV
diff --git a/lib/Numeric/GSL/Matrix.hs b/lib/Numeric/GSL/Matrix.hs
index 09a0be4..07d4660 100644
--- a/lib/Numeric/GSL/Matrix.hs
+++ b/lib/Numeric/GSL/Matrix.hs
@@ -51,8 +51,7 @@ eigSg' m
     | otherwise = unsafePerformIO $ do
         l <- createVector r
         v <- createMatrix RowMajor r r
-        ww3 withMatrix m withVector l withMatrix v $ \m l v ->
-            c_eigS // m // l // v // check "eigSg"
+        app3 c_eigS mat m vec l mat v "eigSg"
         return (l,v)
   where r = rows m
 foreign import ccall "gsl-aux.h eigensystemR" c_eigS :: TMVM
@@ -85,8 +84,7 @@ eigHg' m
     | otherwise = unsafePerformIO $ do
         l <- createVector r
         v <- createMatrix RowMajor r r
-        ww3 withMatrix m withVector l withMatrix v $ \m l v ->
-            c_eigH // m // l // v // check "eigHg"
+        app3 c_eigH mat m vec l mat v "eigHg"
         return (l,v)
   where r = rows m
 foreign import ccall "gsl-aux.h eigensystemC" c_eigH :: TCMVCM
@@ -122,8 +120,7 @@ svd' x = unsafePerformIO $ do
     u <- createMatrix RowMajor r c
     s <- createVector c
     v <- createMatrix RowMajor c c
-    ww4 withMatrix x withMatrix u withVector s withMatrix v $ \x u s v ->
-        c_svd // x // u // s // v // check "svdg"
+    app4 c_svd mat x mat u vec s mat v "svdg"
     return (u,s,v)
   where r = rows x
         c = cols x
@@ -152,8 +149,7 @@ qr = qr' . cmat
 qr' x = unsafePerformIO $ do
     q <- createMatrix RowMajor r r
     rot <- createMatrix RowMajor r c
-    ww3 withMatrix x withMatrix q withMatrix rot $ \x q rot ->
-        c_qr // x // q // rot // check "qr"
+    app3 c_qr mat x mat q mat rot  "qr"
     return (q,rot)
   where r = rows x
         c = cols x
@@ -165,8 +161,7 @@ qrPacked = qrPacked' . cmat
 qrPacked' x = unsafePerformIO $ do
     qr <- createMatrix RowMajor r c
     tau <- createVector (min r c)
-    ww3 withMatrix x withMatrix qr withVector tau $ \x qr tau ->
-        c_qrPacked // x // qr // tau // check "qrUnpacked"
+    app3 c_qrPacked mat x mat qr vec tau "qrUnpacked"
     return (qr,tau)
   where r = rows x
         c = cols x
@@ -178,8 +173,7 @@ unpackQR (qr,tau) = unpackQR' (cmat qr, tau)
 unpackQR' (qr,tau) = unsafePerformIO $ do
     q <- createMatrix RowMajor r r
     res <- createMatrix RowMajor r c
-    ww4 withMatrix qr withVector tau withMatrix q withMatrix res $ \qr tau q res ->
-        c_qrUnpack // qr // tau // q // res // check "qrUnpack"
+    app4 c_qrUnpack mat qr vec tau mat q mat res "qrUnpack"
     return (q,res)
   where r = rows qr
         c = cols qr
@@ -203,8 +197,7 @@ cholR = cholR' . cmat
 
 cholR' x = unsafePerformIO $ do
     r <- createMatrix RowMajor n n
-    ww2 withMatrix x withMatrix r $ \x r ->
-        c_cholR // x // r // check "cholR"
+    app2 c_cholR mat x mat r "cholR"
     return r
   where n = rows x
 foreign import ccall "gsl-aux.h cholR" c_cholR :: TMM
@@ -214,8 +207,7 @@ cholC = cholC' . cmat
 
 cholC' x = unsafePerformIO $ do
     r <- createMatrix RowMajor n n
-    ww2 withMatrix x withMatrix r $ \x r ->
-        c_cholC // x // r // check "cholC"
+    app2 c_cholC mat x mat r "cholC"
     return r
   where n = rows x
 foreign import ccall "gsl-aux.h cholC" c_cholC :: TCMCM
@@ -231,8 +223,7 @@ luSolveR a b = luSolveR' (cmat a) (cmat b)
 luSolveR' a b
     | n1==n2 && n1==r = unsafePerformIO $ do
         s <- createMatrix RowMajor r c
-        ww3 withMatrix a withMatrix b withMatrix s $ \ a b s ->
-            c_luSolveR // a // b // s // check "luSolveR"
+        app3 c_luSolveR mat a mat b mat s "luSolveR"
         return s
     | otherwise = error "luSolveR of nonsquare matrix"
   where n1 = rows a
@@ -249,8 +240,7 @@ luSolveC a b = luSolveC' (cmat a) (cmat b)
 luSolveC' a b
     | n1==n2 && n1==r = unsafePerformIO $ do
         s <- createMatrix RowMajor r c
-        ww3 withMatrix a withMatrix b withMatrix s $ \ a b s ->
-            c_luSolveC // a // b // s // check "luSolveC"
+        app3 c_luSolveC mat a mat b mat s "luSolveC"
         return s
     | otherwise = error "luSolveC of nonsquare matrix"
   where n1 = rows a
@@ -266,8 +256,7 @@ luRaux = luRaux' . cmat
 
 luRaux' x = unsafePerformIO $ do
     res <- createVector (r*r+r+1)
-    ww2 withMatrix x withVector res $ \x res ->
-        c_luRaux // x // res // check "luRaux"
+    app2 c_luRaux mat x vec res "luRaux"
     return res
   where r = rows x
         c = cols x
@@ -280,8 +269,7 @@ luCaux = luCaux' . cmat
 
 luCaux' x = unsafePerformIO $ do
     res <- createVector (r*r+r+1)
-    ww2 withMatrix x withVector res $ \x res ->
-        c_luCaux // x // res // check "luCaux"
+    app2 c_luCaux mat x vec res "luCaux"
     return res
   where r = rows x
         c = cols x
diff --git a/lib/Numeric/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs
index e44b2e5..235a88f 100644
--- a/lib/Numeric/GSL/Minimization.hs
+++ b/lib/Numeric/GSL/Minimization.hs
@@ -196,22 +196,12 @@ aux_vTov f n p r = g where
 
 --------------------------------------------------------------------
 
-
 createV n fun msg = unsafePerformIO $ do
     r <- createVector n
-    withVector r $ \ r ->
-        fun // r // check msg
+    app1 fun vec r msg
     return r
 
-{-
-createM r c fun msg ptrs = unsafePerformIO $ do
-    r <- createMatrix RowMajor r c
-    fun // matc r // check msg ptrs
-    return r
--}
-
 createMIO r c fun msg = do
     r <- createMatrix RowMajor r c
-    withMatrix r $ \ r ->
-        fun // r // check msg
+    app1 fun mat r msg
     return r
diff --git a/lib/Numeric/GSL/Polynomials.hs b/lib/Numeric/GSL/Polynomials.hs
index e663711..3e0cf81 100644
--- a/lib/Numeric/GSL/Polynomials.hs
+++ b/lib/Numeric/GSL/Polynomials.hs
@@ -47,8 +47,7 @@ polySolve = toList . polySolve' . fromList
 polySolve' :: Vector Double -> Vector (Complex Double)
 polySolve' v | dim v > 1 = unsafePerformIO $ do
     r <- createVector (dim v-1)
-    ww2 withVector v withVector r $ \ v r ->
-        c_polySolve // v // r // check "polySolve"
+    app2 c_polySolve vec v vec r "polySolve"
     return r
              | otherwise = error "polySolve on a polynomial of degree zero"
 
diff --git a/lib/Numeric/GSL/Vector.hs b/lib/Numeric/GSL/Vector.hs
index 65f3a2e..86d8f10 100644
--- a/lib/Numeric/GSL/Vector.hs
+++ b/lib/Numeric/GSL/Vector.hs
@@ -73,28 +73,24 @@ data FunCodeS = Norm2
 
 toScalarAux fun code v = unsafePerformIO $ do
     r <- createVector 1
-    ww2 withVector v withVector r $ \v r ->
-        fun (fromEnum code) // v // r // check "toScalarAux"
+    app2 (fun (fromEnum code)) vec v vec r "toScalarAux"
     return (r `at` 0)
 
 vectorMapAux fun code v = unsafePerformIO $ do
     r <- createVector (dim v)
-    ww2 withVector v withVector r $ \v r ->
-        fun (fromEnum code) // v // r // check "vectorMapAux"
+    app2 (fun (fromEnum code)) vec v vec r "vectorMapAux"
     return r
 
 vectorMapValAux fun code val v = unsafePerformIO $ do
     r <- createVector (dim v)
     pval <- newArray [val]
-    ww2 withVector v withVector r $ \v r ->
-        fun (fromEnum code) pval // v // r // check "vectorMapValAux"
+    app2 (fun (fromEnum code) pval) vec v vec r "vectorMapValAux"
     free pval
     return r
 
 vectorZipAux fun code u v = unsafePerformIO $ do
     r <- createVector (dim u)
-    ww3 withVector u withVector v withVector r $ \u v r ->
-        fun (fromEnum code) // u // v // r // check "vectorZipAux"
+    app3 (fun (fromEnum code)) vec u vec v vec r "vectorZipAux"
     return r
 
 ---------------------------------------------------------------------
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs
index 19516e3..936cb19 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK.hs
+++ b/lib/Numeric/LinearAlgebra/LAPACK.hs
@@ -61,8 +61,7 @@ svdAux f st x = unsafePerformIO $ do
     u <- createMatrix ColumnMajor r r
     s <- createVector (min r c)
     v <- createMatrix ColumnMajor c c
-    ww4 withMatrix x withMatrix u withVector s withMatrix v $ \x u s v ->
-        f // x // u // s // v // check st
+    app4 f mat x mat u vec s mat v st
     return (u,s,trans v)
   where r = rows x
         c = cols x
@@ -74,8 +73,7 @@ eigAux f st m
         l <- createVector r
         v <- createMatrix ColumnMajor r r
         dummy <- createMatrix ColumnMajor 1 1
-        ww4 withMatrix m withMatrix dummy withVector l withMatrix v $ \m dummy l v ->
-            f // m // dummy // l // v // check st
+        app4 f mat m mat dummy vec l mat v st
         return (l,v)
   where r = rows m
 
@@ -117,8 +115,7 @@ eigRaux m
         l <- createVector r
         v <- createMatrix ColumnMajor r r
         dummy <- createMatrix ColumnMajor 1 1
-        ww4 withMatrix m withMatrix dummy withVector l withMatrix v $ \m dummy l v ->
-            dgeev // m // dummy // l // v // check "eigR"
+        app4 dgeev mat m mat dummy vec l mat v "eigR"
         return (l,v)
   where r = rows m
 
@@ -147,8 +144,7 @@ eigS' m
     | otherwise = unsafePerformIO $ do
         l <- createVector r
         v <- createMatrix ColumnMajor r r
-        ww3 withMatrix m withVector l withMatrix v $ \m l v ->
-            dsyev // m // l // v // check "eigS"
+        app3 dsyev mat m vec l mat v "eigS"
         return (l,v)
   where r = rows m
 
@@ -170,8 +166,7 @@ eigH' m
     | otherwise = unsafePerformIO $ do
         l <- createVector r
         v <- createMatrix ColumnMajor r r
-        ww3 withMatrix m withVector l withMatrix v $ \m l v ->
-            zheev // m // l // v // check "eigH"
+        app3 zheev mat m vec l mat v "eigH"
         return (l,v)
   where r = rows m
 
@@ -182,8 +177,7 @@ foreign import ccall "LAPACK/lapack-aux.h linearSolveC_l" zgesv :: TCMCMCM
 linearSolveSQAux f st a b
     | n1==n2 && n1==r = unsafePerformIO $ do
         s <- createMatrix ColumnMajor r c
-        ww3 withMatrix a withMatrix b withMatrix s $ \a b s ->
-            f // a // b // s // check st
+        app3 f mat a mat b mat s st
         return s
     | otherwise = error $ st ++ " of nonsquare matrix"
   where n1 = rows a
@@ -207,8 +201,7 @@ foreign import ccall "LAPACK/lapack-aux.h linearSolveSVDC_l" zgelss :: Double ->
 
 linearSolveAux f st a b = unsafePerformIO $ do
     r <- createMatrix ColumnMajor (max m n) nrhs
-    ww3 withMatrix a withMatrix b withMatrix r $ \a b r ->
-            f // a // b // r // check st
+    app3 f mat a mat b mat r st
     return r
   where m = rows a
         n = cols a
@@ -258,8 +251,7 @@ cholS = cholAux dpotrf "cholS" . fmat
 
 cholAux f st a = unsafePerformIO $ do
     r <- createMatrix ColumnMajor n n
-    ww2 withMatrix a withMatrix r $ \a r ->
-        f // a // r // check st
+    app2 f mat a mat r st
     return r
   where n = rows a
 
@@ -278,8 +270,7 @@ qrC = qrAux zgeqr2 "qrC" . fmat
 qrAux f st a = unsafePerformIO $ do
     r <- createMatrix ColumnMajor m n
     tau <- createVector mn
-    ww3 withMatrix a withMatrix r withVector tau $ \ a r tau ->
-        f // a // tau // r // check st
+    app3 f mat a vec tau mat r st
     return (r,tau)
   where m = rows a
         n = cols a
@@ -300,8 +291,7 @@ hessC = hessAux zgehrd "hessC" . fmat
 hessAux f st a = unsafePerformIO $ do
     r <- createMatrix ColumnMajor m n
     tau <- createVector (mn-1)
-    ww3 withMatrix a withMatrix r withVector tau $ \ a r tau ->
-        f // a // tau // r // check st
+    app3 f mat a vec tau mat r st
     return (r,tau)
   where m = rows a
         n = cols a
@@ -322,8 +312,7 @@ schurC = schurAux zgees "schurC" . fmat
 schurAux f st a = unsafePerformIO $ do
     u <- createMatrix ColumnMajor n n
     s <- createMatrix ColumnMajor n n
-    ww3 withMatrix a withMatrix u withMatrix s $ \ a u s ->
-        f // a // u // s // check st
+    app3 f mat a mat u mat s st
     return (u,s)
   where n = rows a