diff options
author | Alberto Ruiz <aruiz@um.es> | 2014-05-08 13:43:07 +0200 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2014-05-08 13:43:07 +0200 |
commit | 551cf7498c33bc0948bb4cb8444ae6f8af7278ea (patch) | |
tree | ec86ff73151746f5e13b83549ea5c60ed442764d /packages/hmatrix/src/Numeric/ContainerBoot.hs | |
parent | 561a6c0e21bb77c21114ccbbd86d3af5ddb5a3f1 (diff) |
separation ok
Diffstat (limited to 'packages/hmatrix/src/Numeric/ContainerBoot.hs')
-rw-r--r-- | packages/hmatrix/src/Numeric/ContainerBoot.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/hmatrix/src/Numeric/ContainerBoot.hs b/packages/hmatrix/src/Numeric/ContainerBoot.hs index ea4262c..ef21763 100644 --- a/packages/hmatrix/src/Numeric/ContainerBoot.hs +++ b/packages/hmatrix/src/Numeric/ContainerBoot.hs | |||
@@ -42,7 +42,7 @@ module Numeric.ContainerBoot ( | |||
42 | import Data.Packed | 42 | import Data.Packed |
43 | import Data.Packed.ST as ST | 43 | import Data.Packed.ST as ST |
44 | import Numeric.Conversion | 44 | import Numeric.Conversion |
45 | import Data.Packed.Internal | 45 | import Data.Packed.Development |
46 | import Numeric.GSL.Vector | 46 | import Numeric.GSL.Vector |
47 | import Data.Complex | 47 | import Data.Complex |
48 | import Control.Applicative((<*>)) | 48 | import Control.Applicative((<*>)) |
@@ -201,7 +201,7 @@ instance Container Vector Float where | |||
201 | equal u v = dim u == dim v && maxElement (vectorMapF Abs (sub u v)) == 0.0 | 201 | equal u v = dim u == dim v && maxElement (vectorMapF Abs (sub u v)) == 0.0 |
202 | arctan2 = vectorZipF ATan2 | 202 | arctan2 = vectorZipF ATan2 |
203 | scalar x = fromList [x] | 203 | scalar x = fromList [x] |
204 | konst' = constantD | 204 | konst' = constant |
205 | build' = buildV | 205 | build' = buildV |
206 | conj = id | 206 | conj = id |
207 | cmap = mapVector | 207 | cmap = mapVector |
@@ -229,7 +229,7 @@ instance Container Vector Double where | |||
229 | equal u v = dim u == dim v && maxElement (vectorMapR Abs (sub u v)) == 0.0 | 229 | equal u v = dim u == dim v && maxElement (vectorMapR Abs (sub u v)) == 0.0 |
230 | arctan2 = vectorZipR ATan2 | 230 | arctan2 = vectorZipR ATan2 |
231 | scalar x = fromList [x] | 231 | scalar x = fromList [x] |
232 | konst' = constantD | 232 | konst' = constant |
233 | build' = buildV | 233 | build' = buildV |
234 | conj = id | 234 | conj = id |
235 | cmap = mapVector | 235 | cmap = mapVector |
@@ -257,7 +257,7 @@ instance Container Vector (Complex Double) where | |||
257 | equal u v = dim u == dim v && maxElement (mapVector magnitude (sub u v)) == 0.0 | 257 | equal u v = dim u == dim v && maxElement (mapVector magnitude (sub u v)) == 0.0 |
258 | arctan2 = vectorZipC ATan2 | 258 | arctan2 = vectorZipC ATan2 |
259 | scalar x = fromList [x] | 259 | scalar x = fromList [x] |
260 | konst' = constantD | 260 | konst' = constant |
261 | build' = buildV | 261 | build' = buildV |
262 | conj = conjugateC | 262 | conj = conjugateC |
263 | cmap = mapVector | 263 | cmap = mapVector |
@@ -285,7 +285,7 @@ instance Container Vector (Complex Float) where | |||
285 | equal u v = dim u == dim v && maxElement (mapVector magnitude (sub u v)) == 0.0 | 285 | equal u v = dim u == dim v && maxElement (mapVector magnitude (sub u v)) == 0.0 |
286 | arctan2 = vectorZipQ ATan2 | 286 | arctan2 = vectorZipQ ATan2 |
287 | scalar x = fromList [x] | 287 | scalar x = fromList [x] |
288 | konst' = constantD | 288 | konst' = constant |
289 | build' = buildV | 289 | build' = buildV |
290 | conj = conjugateQ | 290 | conj = conjugateQ |
291 | cmap = mapVector | 291 | cmap = mapVector |
@@ -569,7 +569,7 @@ diag v = diagRect 0 v n n where n = dim v | |||
569 | 569 | ||
570 | -- | creates the identity matrix of given dimension | 570 | -- | creates the identity matrix of given dimension |
571 | ident :: (Num a, Element a) => Int -> Matrix a | 571 | ident :: (Num a, Element a) => Int -> Matrix a |
572 | ident n = diag (constantD 1 n) | 572 | ident n = diag (constant 1 n) |
573 | 573 | ||
574 | -------------------------------------------------------- | 574 | -------------------------------------------------------- |
575 | 575 | ||