summaryrefslogtreecommitdiff
path: root/lib/Data
diff options
context:
space:
mode:
authorMike Ledger <eleventynine@gmail.com>2013-06-24 23:17:39 +1000
committerMike Ledger <eleventynine@gmail.com>2013-06-24 23:17:39 +1000
commit027fa6391bc7b21a8aecbdc577ad485aee274333 (patch)
tree1a2a6780d40b04fde19c8b6a407ecec1542fee3d /lib/Data
parent29c622322ee14b10b2a73b40fb403bb7eaa2ec40 (diff)
Revert "add CDouble/CFloat instances for Element"
This reverts commit d302e91710db7cccb32853cfd861b9f869eb4e31.
Diffstat (limited to 'lib/Data')
-rw-r--r--lib/Data/Packed/Internal/Matrix.hs28
1 files changed, 0 insertions, 28 deletions
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 8158679..255009c 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -260,34 +260,18 @@ instance Element Float where
260 transdata = transdataAux ctransF 260 transdata = transdataAux ctransF
261 constantD = constantAux cconstantF 261 constantD = constantAux cconstantF
262 262
263instance Element CFloat where
264 transdata = transdataAux ctransCF
265 constantD = constantAux cconstantCF
266
267instance Element Double where 263instance Element Double where
268 transdata = transdataAux ctransR 264 transdata = transdataAux ctransR
269 constantD = constantAux cconstantR 265 constantD = constantAux cconstantR
270 266
271instance Element CDouble where
272 transdata = transdataAux ctransCR
273 constantD = constantAux cconstantCR
274
275instance Element (Complex Float) where 267instance Element (Complex Float) where
276 transdata = transdataAux ctransQ 268 transdata = transdataAux ctransQ
277 constantD = constantAux cconstantQ 269 constantD = constantAux cconstantQ
278 270
279instance Element (Complex CFloat) where
280 transdata = transdataAux ctransCQ
281 constantD = constantAux cconstantCQ
282
283instance Element (Complex Double) where 271instance Element (Complex Double) where
284 transdata = transdataAux ctransC 272 transdata = transdataAux ctransC
285 constantD = constantAux cconstantC 273 constantD = constantAux cconstantC
286 274
287instance Element (Complex CDouble) where
288 transdata = transdataAux ctransCC
289 constantD = constantAux cconstantCC
290
291------------------------------------------------------------------- 275-------------------------------------------------------------------
292 276
293transdata' :: Storable a => Int -> Vector a -> Int -> Vector a 277transdata' :: Storable a => Int -> Vector a -> Int -> Vector a
@@ -347,17 +331,9 @@ transdataP c1 d c2 =
347 noneed = r1 == 1 || c1 == 1 331 noneed = r1 == 1 || c1 == 1
348 332
349foreign import ccall unsafe "transF" ctransF :: TFMFM 333foreign import ccall unsafe "transF" ctransF :: TFMFM
350foreign import ccall unsafe "transF" ctransCF :: CInt -> CInt -> Ptr CFloat -> CInt -> CInt -> Ptr CFloat -> IO CInt
351
352foreign import ccall unsafe "transR" ctransR :: TMM 334foreign import ccall unsafe "transR" ctransR :: TMM
353foreign import ccall unsafe "transR" ctransCR :: CInt -> CInt -> Ptr CDouble -> CInt -> CInt -> Ptr CDouble -> IO CInt
354
355foreign import ccall unsafe "transQ" ctransQ :: TQMQM 335foreign import ccall unsafe "transQ" ctransQ :: TQMQM
356foreign import ccall unsafe "transQ" ctransCQ :: CInt -> CInt -> Ptr (Complex CFloat) -> CInt -> CInt -> Ptr (Complex CFloat) -> IO CInt
357
358foreign import ccall unsafe "transC" ctransC :: TCMCM 336foreign import ccall unsafe "transC" ctransC :: TCMCM
359foreign import ccall unsafe "transC" ctransCC :: CInt -> CInt -> Ptr (Complex CDouble) -> CInt -> CInt -> Ptr (Complex CDouble) -> IO CInt
360
361foreign import ccall unsafe "transP" ctransP :: CInt -> CInt -> Ptr () -> CInt -> CInt -> CInt -> Ptr () -> CInt -> IO CInt 337foreign import ccall unsafe "transP" ctransP :: CInt -> CInt -> Ptr () -> CInt -> CInt -> CInt -> Ptr () -> CInt -> IO CInt
362 338
363---------------------------------------------------------------------- 339----------------------------------------------------------------------
@@ -382,22 +358,18 @@ constantAux fun x n = unsafePerformIO $ do
382constantF :: Float -> Int -> Vector Float 358constantF :: Float -> Int -> Vector Float
383constantF = constantAux cconstantF 359constantF = constantAux cconstantF
384foreign import ccall unsafe "constantF" cconstantF :: Ptr Float -> TF 360foreign import ccall unsafe "constantF" cconstantF :: Ptr Float -> TF
385foreign import ccall unsafe "constantF" cconstantCF :: Ptr CFloat -> CInt -> Ptr CFloat -> IO CInt
386 361
387constantR :: Double -> Int -> Vector Double 362constantR :: Double -> Int -> Vector Double
388constantR = constantAux cconstantR 363constantR = constantAux cconstantR
389foreign import ccall unsafe "constantR" cconstantR :: Ptr Double -> TV 364foreign import ccall unsafe "constantR" cconstantR :: Ptr Double -> TV
390foreign import ccall unsafe "constantR" cconstantCR :: Ptr CDouble -> CInt -> Ptr CDouble -> IO CInt
391 365
392constantQ :: Complex Float -> Int -> Vector (Complex Float) 366constantQ :: Complex Float -> Int -> Vector (Complex Float)
393constantQ = constantAux cconstantQ 367constantQ = constantAux cconstantQ
394foreign import ccall unsafe "constantQ" cconstantQ :: Ptr (Complex Float) -> TQV 368foreign import ccall unsafe "constantQ" cconstantQ :: Ptr (Complex Float) -> TQV
395foreign import ccall unsafe "constantQ" cconstantCQ :: Ptr (Complex CFloat) -> CInt -> Ptr (Complex CFloat) -> IO CInt
396 369
397constantC :: Complex Double -> Int -> Vector (Complex Double) 370constantC :: Complex Double -> Int -> Vector (Complex Double)
398constantC = constantAux cconstantC 371constantC = constantAux cconstantC
399foreign import ccall unsafe "constantC" cconstantC :: Ptr (Complex Double) -> TCV 372foreign import ccall unsafe "constantC" cconstantC :: Ptr (Complex Double) -> TCV
400foreign import ccall unsafe "constantC" cconstantCC :: Ptr (Complex CDouble) -> CInt -> Ptr (Complex CDouble) -> IO CInt
401 373
402constantP :: Storable a => a -> Int -> Vector a 374constantP :: Storable a => a -> Int -> Vector a
403constantP a n = unsafePerformIO $ do 375constantP a n = unsafePerformIO $ do