diff options
author | Alberto Ruiz <aruiz@um.es> | 2007-11-12 10:01:39 +0000 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2007-11-12 10:01:39 +0000 |
commit | c41d21fefa04c66039a0b218daaa53c2577ef838 (patch) | |
tree | 3dd182457a89edbf52688fb43fdc8b2a130829e8 /lib/Data/Packed.hs | |
parent | 9e6500bf8e925b363e74e01834f81dde0810f808 (diff) |
data structures simplification
Diffstat (limited to 'lib/Data/Packed.hs')
-rw-r--r-- | lib/Data/Packed.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Data/Packed.hs b/lib/Data/Packed.hs index 53aced9..bb25c26 100644 --- a/lib/Data/Packed.hs +++ b/lib/Data/Packed.hs | |||
@@ -24,7 +24,7 @@ module Data.Packed ( | |||
24 | import Data.Packed.Vector | 24 | import Data.Packed.Vector |
25 | import Data.Packed.Matrix | 25 | import Data.Packed.Matrix |
26 | import Data.Complex | 26 | import Data.Complex |
27 | import Data.Packed.Internal | 27 | import Data.Packed.Internal(fromComplex,toComplex,comp,conj) |
28 | 28 | ||
29 | -- | conversion utilities | 29 | -- | conversion utilities |
30 | class (Element e) => Container c e where | 30 | class (Element e) => Container c e where |
@@ -54,7 +54,7 @@ instance Container Vector (Complex Double) where | |||
54 | instance Container Matrix Double where | 54 | instance Container Matrix Double where |
55 | toComplex = uncurry $ liftMatrix2 $ curry Data.Packed.toComplex | 55 | toComplex = uncurry $ liftMatrix2 $ curry Data.Packed.toComplex |
56 | fromComplex z = (reshape c r, reshape c i) | 56 | fromComplex z = (reshape c r, reshape c i) |
57 | where (r,i) = Data.Packed.fromComplex (cdat z) | 57 | where (r,i) = Data.Packed.fromComplex (flatten z) |
58 | c = cols z | 58 | c = cols z |
59 | comp = liftMatrix Data.Packed.Internal.comp | 59 | comp = liftMatrix Data.Packed.Internal.comp |
60 | conj = liftMatrix Data.Packed.Internal.conj | 60 | conj = liftMatrix Data.Packed.Internal.conj |