summaryrefslogtreecommitdiff
path: root/lib/GSL
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2007-06-22 10:21:15 +0000
committerAlberto Ruiz <aruiz@um.es>2007-06-22 10:21:15 +0000
commit989bdf7e88c13500bd1986dcde36f6cc4f467efb (patch)
treeb30ff0dd52e2b6c2adb1dfe8759d03234f65c684 /lib/GSL
parentaa14e6615533e7bd5e2b15acdc3ec76afbe1aac4 (diff)
reverting to the old signatures for aux C functions
Diffstat (limited to 'lib/GSL')
-rw-r--r--lib/GSL/Fourier.hs2
-rw-r--r--lib/GSL/Minimization.hs6
-rw-r--r--lib/GSL/Polynomials.hs2
-rw-r--r--lib/GSL/Vector.hs14
4 files changed, 12 insertions, 12 deletions
diff --git a/lib/GSL/Fourier.hs b/lib/GSL/Fourier.hs
index c8c79f0..bf6cd60 100644
--- a/lib/GSL/Fourier.hs
+++ b/lib/GSL/Fourier.hs
@@ -29,7 +29,7 @@ genfft code v = unsafePerformIO $ do
29 c_fft code // vec v // vec r // check "fft" [v] 29 c_fft code // vec v // vec r // check "fft" [v]
30 return r 30 return r
31 31
32foreign import ccall "gsl-aux.h fft" c_fft :: Int -> Complex Double :> Complex Double :> IO Int 32foreign import ccall "gsl-aux.h fft" c_fft :: Int -> TCVCV -- Complex Double :> Complex Double :> IO Int
33 33
34 34
35{- | Fast 1D Fourier transform of a 'Vector' @(@'Complex' 'Double'@)@ using /gsl_fft_complex_forward/. It uses the same scaling conventions as GNU Octave. 35{- | Fast 1D Fourier transform of a 'Vector' @(@'Complex' 'Double'@)@ using /gsl_fft_complex_forward/. It uses the same scaling conventions as GNU Octave.
diff --git a/lib/GSL/Minimization.hs b/lib/GSL/Minimization.hs
index bc228a7..32b266f 100644
--- a/lib/GSL/Minimization.hs
+++ b/lib/GSL/Minimization.hs
@@ -97,7 +97,7 @@ minimizeNMSimplex f xi sz tol maxit = unsafePerformIO $ do
97 97
98foreign import ccall "gsl-aux.h minimize" 98foreign import ccall "gsl-aux.h minimize"
99 c_minimizeNMSimplex:: FunPtr (Int -> Ptr Double -> Double) -> Double -> Int 99 c_minimizeNMSimplex:: FunPtr (Int -> Ptr Double -> Double) -> Double -> Int
100 -> Double :> Double :> Double ::> IO Int 100 -> TVVM -- Double :> Double :> Double ::> IO Int
101 101
102---------------------------------------------------------------------------------- 102----------------------------------------------------------------------------------
103 103
@@ -164,8 +164,8 @@ minimizeConjugateGradient istep minimpar tol maxit f df xi = unsafePerformIO $ d
164foreign import ccall "gsl-aux.h minimizeWithDeriv" 164foreign import ccall "gsl-aux.h minimizeWithDeriv"
165 c_minimizeConjugateGradient :: FunPtr (Int -> Ptr Double -> Double) 165 c_minimizeConjugateGradient :: FunPtr (Int -> Ptr Double -> Double)
166 -> FunPtr (Int -> Ptr Double -> Ptr Double -> IO ()) 166 -> FunPtr (Int -> Ptr Double -> Ptr Double -> IO ())
167 -> Double -> Double -> Double -> Int 167 -> Double -> Double -> Double -> Int
168 -> Double :> Double ::> IO Int 168 -> TVM -- Double :> Double ::> IO Int
169 169
170--------------------------------------------------------------------- 170---------------------------------------------------------------------
171iv :: (Vector Double -> Double) -> (Int -> Ptr Double -> Double) 171iv :: (Vector Double -> Double) -> (Int -> Ptr Double -> Double)
diff --git a/lib/GSL/Polynomials.hs b/lib/GSL/Polynomials.hs
index d7db9a3..365c74e 100644
--- a/lib/GSL/Polynomials.hs
+++ b/lib/GSL/Polynomials.hs
@@ -51,4 +51,4 @@ polySolve' v | dim v > 1 = unsafePerformIO $ do
51 return r 51 return r
52 | otherwise = error "polySolve on a polynomial of degree zero" 52 | otherwise = error "polySolve on a polynomial of degree zero"
53 53
54foreign import ccall "gsl-aux.h polySolve" c_polySolve:: Double :> Complex Double :> IO Int 54foreign import ccall "gsl-aux.h polySolve" c_polySolve:: TVCV -- Double :> Complex Double :> IO Int
diff --git a/lib/GSL/Vector.hs b/lib/GSL/Vector.hs
index 3225139..fc80c16 100644
--- a/lib/GSL/Vector.hs
+++ b/lib/GSL/Vector.hs
@@ -122,7 +122,7 @@ toScalarR :: FunCodeS -> Vector Double -> Double
122toScalarR oper = toScalarAux c_toScalarR (fromEnum oper) 122toScalarR oper = toScalarAux c_toScalarR (fromEnum oper)
123 123
124foreign import ccall safe "gsl-aux.h toScalarR" 124foreign import ccall safe "gsl-aux.h toScalarR"
125 c_toScalarR :: Int -> Double :> Double :> IO Int 125 c_toScalarR :: Int -> TVV -- Double :> Double :> IO Int
126 126
127------------------------------------------------------------------ 127------------------------------------------------------------------
128 128
@@ -131,14 +131,14 @@ vectorMapR :: FunCodeV -> Vector Double -> Vector Double
131vectorMapR = vectorMapAux c_vectorMapR 131vectorMapR = vectorMapAux c_vectorMapR
132 132
133foreign import ccall safe "gsl-aux.h mapR" 133foreign import ccall safe "gsl-aux.h mapR"
134 c_vectorMapR :: Int -> Double :> Double :> IO Int 134 c_vectorMapR :: Int -> TVV -- Double :> Double :> IO Int
135 135
136-- | map of complex vectors with given function 136-- | map of complex vectors with given function
137vectorMapC :: FunCodeV -> Vector (Complex Double) -> Vector (Complex Double) 137vectorMapC :: FunCodeV -> Vector (Complex Double) -> Vector (Complex Double)
138vectorMapC oper = vectorMapAux c_vectorMapC (fromEnum oper) 138vectorMapC oper = vectorMapAux c_vectorMapC (fromEnum oper)
139 139
140foreign import ccall safe "gsl-aux.h mapC" 140foreign import ccall safe "gsl-aux.h mapC"
141 c_vectorMapC :: Int -> Complex Double :> Complex Double :> IO Int 141 c_vectorMapC :: Int -> TCVCV -- Complex Double :> Complex Double :> IO Int
142 142
143------------------------------------------------------------------- 143-------------------------------------------------------------------
144 144
@@ -147,14 +147,14 @@ vectorMapValR :: FunCodeSV -> Double -> Vector Double -> Vector Double
147vectorMapValR oper = vectorMapValAux c_vectorMapValR (fromEnum oper) 147vectorMapValR oper = vectorMapValAux c_vectorMapValR (fromEnum oper)
148 148
149foreign import ccall safe "gsl-aux.h mapValR" 149foreign import ccall safe "gsl-aux.h mapValR"
150 c_vectorMapValR :: Int -> Ptr Double -> Double :> Double :> IO Int 150 c_vectorMapValR :: Int -> Ptr Double -> TVV -- Double :> Double :> IO Int
151 151
152-- | map of complex vectors with given function 152-- | map of complex vectors with given function
153vectorMapValC :: FunCodeSV -> Complex Double -> Vector (Complex Double) -> Vector (Complex Double) 153vectorMapValC :: FunCodeSV -> Complex Double -> Vector (Complex Double) -> Vector (Complex Double)
154vectorMapValC = vectorMapValAux c_vectorMapValC 154vectorMapValC = vectorMapValAux c_vectorMapValC
155 155
156foreign import ccall safe "gsl-aux.h mapValC" 156foreign import ccall safe "gsl-aux.h mapValC"
157 c_vectorMapValC :: Int -> Ptr (Complex Double) -> Complex Double :> Complex Double :> IO Int 157 c_vectorMapValC :: Int -> Ptr (Complex Double) -> TCVCV -- Complex Double :> Complex Double :> IO Int
158 158
159------------------------------------------------------------------- 159-------------------------------------------------------------------
160 160
@@ -163,13 +163,13 @@ vectorZipR :: FunCodeVV -> Vector Double -> Vector Double -> Vector Double
163vectorZipR = vectorZipAux c_vectorZipR 163vectorZipR = vectorZipAux c_vectorZipR
164 164
165foreign import ccall safe "gsl-aux.h zipR" 165foreign import ccall safe "gsl-aux.h zipR"
166 c_vectorZipR :: Int -> Double :> Double :> Double :> IO Int 166 c_vectorZipR :: Int -> TVVV -- Double :> Double :> Double :> IO Int
167 167
168-- | elementwise operation on complex vectors 168-- | elementwise operation on complex vectors
169vectorZipC :: FunCodeVV -> Vector (Complex Double) -> Vector (Complex Double) -> Vector (Complex Double) 169vectorZipC :: FunCodeVV -> Vector (Complex Double) -> Vector (Complex Double) -> Vector (Complex Double)
170vectorZipC = vectorZipAux c_vectorZipC 170vectorZipC = vectorZipAux c_vectorZipC
171 171
172foreign import ccall safe "gsl-aux.h zipC" 172foreign import ccall safe "gsl-aux.h zipC"
173 c_vectorZipC :: Int -> Complex Double :> Complex Double :> Complex Double :> IO Int 173 c_vectorZipC :: Int -> TCVCVCV -- Complex Double :> Complex Double :> Complex Double :> IO Int
174 174
175 175