diff options
author | Alberto Ruiz <aruiz@um.es> | 2007-06-22 10:21:15 +0000 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2007-06-22 10:21:15 +0000 |
commit | 989bdf7e88c13500bd1986dcde36f6cc4f467efb (patch) | |
tree | b30ff0dd52e2b6c2adb1dfe8759d03234f65c684 /lib/GSL/Vector.hs | |
parent | aa14e6615533e7bd5e2b15acdc3ec76afbe1aac4 (diff) |
reverting to the old signatures for aux C functions
Diffstat (limited to 'lib/GSL/Vector.hs')
-rw-r--r-- | lib/GSL/Vector.hs | 14 |
1 files changed, 7 insertions, 7 deletions
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 | |||
122 | toScalarR oper = toScalarAux c_toScalarR (fromEnum oper) | 122 | toScalarR oper = toScalarAux c_toScalarR (fromEnum oper) |
123 | 123 | ||
124 | foreign import ccall safe "gsl-aux.h toScalarR" | 124 | foreign 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 | |||
131 | vectorMapR = vectorMapAux c_vectorMapR | 131 | vectorMapR = vectorMapAux c_vectorMapR |
132 | 132 | ||
133 | foreign import ccall safe "gsl-aux.h mapR" | 133 | foreign 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 |
137 | vectorMapC :: FunCodeV -> Vector (Complex Double) -> Vector (Complex Double) | 137 | vectorMapC :: FunCodeV -> Vector (Complex Double) -> Vector (Complex Double) |
138 | vectorMapC oper = vectorMapAux c_vectorMapC (fromEnum oper) | 138 | vectorMapC oper = vectorMapAux c_vectorMapC (fromEnum oper) |
139 | 139 | ||
140 | foreign import ccall safe "gsl-aux.h mapC" | 140 | foreign 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 | |||
147 | vectorMapValR oper = vectorMapValAux c_vectorMapValR (fromEnum oper) | 147 | vectorMapValR oper = vectorMapValAux c_vectorMapValR (fromEnum oper) |
148 | 148 | ||
149 | foreign import ccall safe "gsl-aux.h mapValR" | 149 | foreign 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 |
153 | vectorMapValC :: FunCodeSV -> Complex Double -> Vector (Complex Double) -> Vector (Complex Double) | 153 | vectorMapValC :: FunCodeSV -> Complex Double -> Vector (Complex Double) -> Vector (Complex Double) |
154 | vectorMapValC = vectorMapValAux c_vectorMapValC | 154 | vectorMapValC = vectorMapValAux c_vectorMapValC |
155 | 155 | ||
156 | foreign import ccall safe "gsl-aux.h mapValC" | 156 | foreign 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 | |||
163 | vectorZipR = vectorZipAux c_vectorZipR | 163 | vectorZipR = vectorZipAux c_vectorZipR |
164 | 164 | ||
165 | foreign import ccall safe "gsl-aux.h zipR" | 165 | foreign 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 |
169 | vectorZipC :: FunCodeVV -> Vector (Complex Double) -> Vector (Complex Double) -> Vector (Complex Double) | 169 | vectorZipC :: FunCodeVV -> Vector (Complex Double) -> Vector (Complex Double) -> Vector (Complex Double) |
170 | vectorZipC = vectorZipAux c_vectorZipC | 170 | vectorZipC = vectorZipAux c_vectorZipC |
171 | 171 | ||
172 | foreign import ccall safe "gsl-aux.h zipC" | 172 | foreign 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 | ||