diff options
author | Alberto Ruiz <aruiz@um.es> | 2007-06-22 17:33:17 +0000 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2007-06-22 17:33:17 +0000 |
commit | 978e6d038239af50d70bae2c303f4e45b1879b7a (patch) | |
tree | 571b2060f388d0693820f808b40089acb100a5d9 /lib/GSL/Vector.hs | |
parent | 989bdf7e88c13500bd1986dcde36f6cc4f467efb (diff) |
refactoring
Diffstat (limited to 'lib/GSL/Vector.hs')
-rw-r--r-- | lib/GSL/Vector.hs | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/lib/GSL/Vector.hs b/lib/GSL/Vector.hs index fc80c16..a772b34 100644 --- a/lib/GSL/Vector.hs +++ b/lib/GSL/Vector.hs | |||
@@ -121,8 +121,7 @@ vectorZipAux fun code u v = unsafePerformIO $ do | |||
121 | toScalarR :: FunCodeS -> Vector Double -> Double | 121 | 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" c_toScalarR :: Int -> TVV |
125 | c_toScalarR :: Int -> TVV -- Double :> Double :> IO Int | ||
126 | 125 | ||
127 | ------------------------------------------------------------------ | 126 | ------------------------------------------------------------------ |
128 | 127 | ||
@@ -130,15 +129,13 @@ foreign import ccall safe "gsl-aux.h toScalarR" | |||
130 | vectorMapR :: FunCodeV -> Vector Double -> Vector Double | 129 | vectorMapR :: FunCodeV -> Vector Double -> Vector Double |
131 | vectorMapR = vectorMapAux c_vectorMapR | 130 | vectorMapR = vectorMapAux c_vectorMapR |
132 | 131 | ||
133 | foreign import ccall safe "gsl-aux.h mapR" | 132 | foreign import ccall safe "gsl-aux.h mapR" c_vectorMapR :: Int -> TVV |
134 | c_vectorMapR :: Int -> TVV -- Double :> Double :> IO Int | ||
135 | 133 | ||
136 | -- | map of complex vectors with given function | 134 | -- | map of complex vectors with given function |
137 | vectorMapC :: FunCodeV -> Vector (Complex Double) -> Vector (Complex Double) | 135 | vectorMapC :: FunCodeV -> Vector (Complex Double) -> Vector (Complex Double) |
138 | vectorMapC oper = vectorMapAux c_vectorMapC (fromEnum oper) | 136 | vectorMapC oper = vectorMapAux c_vectorMapC (fromEnum oper) |
139 | 137 | ||
140 | foreign import ccall safe "gsl-aux.h mapC" | 138 | foreign import ccall safe "gsl-aux.h mapC" c_vectorMapC :: Int -> TCVCV |
141 | c_vectorMapC :: Int -> TCVCV -- Complex Double :> Complex Double :> IO Int | ||
142 | 139 | ||
143 | ------------------------------------------------------------------- | 140 | ------------------------------------------------------------------- |
144 | 141 | ||
@@ -146,15 +143,13 @@ foreign import ccall safe "gsl-aux.h mapC" | |||
146 | vectorMapValR :: FunCodeSV -> Double -> Vector Double -> Vector Double | 143 | vectorMapValR :: FunCodeSV -> Double -> Vector Double -> Vector Double |
147 | vectorMapValR oper = vectorMapValAux c_vectorMapValR (fromEnum oper) | 144 | vectorMapValR oper = vectorMapValAux c_vectorMapValR (fromEnum oper) |
148 | 145 | ||
149 | foreign import ccall safe "gsl-aux.h mapValR" | 146 | foreign import ccall safe "gsl-aux.h mapValR" c_vectorMapValR :: Int -> Ptr Double -> TVV |
150 | c_vectorMapValR :: Int -> Ptr Double -> TVV -- Double :> Double :> IO Int | ||
151 | 147 | ||
152 | -- | map of complex vectors with given function | 148 | -- | map of complex vectors with given function |
153 | vectorMapValC :: FunCodeSV -> Complex Double -> Vector (Complex Double) -> Vector (Complex Double) | 149 | vectorMapValC :: FunCodeSV -> Complex Double -> Vector (Complex Double) -> Vector (Complex Double) |
154 | vectorMapValC = vectorMapValAux c_vectorMapValC | 150 | vectorMapValC = vectorMapValAux c_vectorMapValC |
155 | 151 | ||
156 | foreign import ccall safe "gsl-aux.h mapValC" | 152 | foreign import ccall safe "gsl-aux.h mapValC" c_vectorMapValC :: Int -> Ptr (Complex Double) -> TCVCV |
157 | c_vectorMapValC :: Int -> Ptr (Complex Double) -> TCVCV -- Complex Double :> Complex Double :> IO Int | ||
158 | 153 | ||
159 | ------------------------------------------------------------------- | 154 | ------------------------------------------------------------------- |
160 | 155 | ||
@@ -162,14 +157,10 @@ foreign import ccall safe "gsl-aux.h mapValC" | |||
162 | vectorZipR :: FunCodeVV -> Vector Double -> Vector Double -> Vector Double | 157 | vectorZipR :: FunCodeVV -> Vector Double -> Vector Double -> Vector Double |
163 | vectorZipR = vectorZipAux c_vectorZipR | 158 | vectorZipR = vectorZipAux c_vectorZipR |
164 | 159 | ||
165 | foreign import ccall safe "gsl-aux.h zipR" | 160 | foreign import ccall safe "gsl-aux.h zipR" c_vectorZipR :: Int -> TVVV |
166 | c_vectorZipR :: Int -> TVVV -- Double :> Double :> Double :> IO Int | ||
167 | 161 | ||
168 | -- | elementwise operation on complex vectors | 162 | -- | elementwise operation on complex vectors |
169 | vectorZipC :: FunCodeVV -> Vector (Complex Double) -> Vector (Complex Double) -> Vector (Complex Double) | 163 | vectorZipC :: FunCodeVV -> Vector (Complex Double) -> Vector (Complex Double) -> Vector (Complex Double) |
170 | vectorZipC = vectorZipAux c_vectorZipC | 164 | vectorZipC = vectorZipAux c_vectorZipC |
171 | 165 | ||
172 | foreign import ccall safe "gsl-aux.h zipC" | 166 | foreign import ccall safe "gsl-aux.h zipC" c_vectorZipC :: Int -> TCVCVCV |
173 | c_vectorZipC :: Int -> TCVCVCV -- Complex Double :> Complex Double :> Complex Double :> IO Int | ||
174 | |||
175 | |||