diff options
author | Alberto Ruiz <aruiz@um.es> | 2015-05-27 09:10:22 +0200 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2015-05-27 09:10:22 +0200 |
commit | c5795a191ded450987a30302c1d1fa4a265350ff (patch) | |
tree | e3f9f754de966189dab7e4cbdddf96a4750cace8 /packages/base/src/Numeric | |
parent | f3a044a6219bd098fe5d55ef427b9ae6fe360cb9 (diff) |
ccompare, cselect, toInt
Diffstat (limited to 'packages/base/src/Numeric')
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Data.hs | 7 | ||||
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Util.hs | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/base/src/Numeric/LinearAlgebra/Data.hs b/packages/base/src/Numeric/LinearAlgebra/Data.hs index 2aac2e4..79dd06b 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Data.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Data.hs | |||
@@ -59,7 +59,9 @@ module Numeric.LinearAlgebra.Data( | |||
59 | fromBlocks, (|||), (===), diagBlock, repmat, toBlocks, toBlocksEvery, | 59 | fromBlocks, (|||), (===), diagBlock, repmat, toBlocks, toBlocksEvery, |
60 | 60 | ||
61 | -- * Mapping functions | 61 | -- * Mapping functions |
62 | conj, cmap, cmod, step, cond, | 62 | conj, cmap, cmod, |
63 | |||
64 | step, cond, ccompare, cselect, | ||
63 | 65 | ||
64 | -- * Find elements | 66 | -- * Find elements |
65 | find, maxIndex, minIndex, maxElement, minElement, | 67 | find, maxIndex, minIndex, maxElement, minElement, |
@@ -78,7 +80,7 @@ module Numeric.LinearAlgebra.Data( | |||
78 | -- * Element conversion | 80 | -- * Element conversion |
79 | Convert(..), | 81 | Convert(..), |
80 | roundVector, | 82 | roundVector, |
81 | fromInt, | 83 | fromInt,toInt, |
82 | -- * Misc | 84 | -- * Misc |
83 | arctan2, | 85 | arctan2, |
84 | separable, | 86 | separable, |
@@ -95,6 +97,5 @@ import Data.Packed.Numeric | |||
95 | import Numeric.LinearAlgebra.Util hiding ((&),(#)) | 97 | import Numeric.LinearAlgebra.Util hiding ((&),(#)) |
96 | import Data.Complex | 98 | import Data.Complex |
97 | import Numeric.Sparse | 99 | import Numeric.Sparse |
98 | import Data.Packed.Internal.Numeric(I,Extractor(..),(??),fromInt,range,idxs) | ||
99 | 100 | ||
100 | 101 | ||
diff --git a/packages/base/src/Numeric/LinearAlgebra/Util.hs b/packages/base/src/Numeric/LinearAlgebra/Util.hs index eadd2a2..779630f 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Util.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Util.hs | |||
@@ -66,7 +66,6 @@ import Control.Monad(when) | |||
66 | import Text.Printf | 66 | import Text.Printf |
67 | import Data.List.Split(splitOn) | 67 | import Data.List.Split(splitOn) |
68 | import Data.List(intercalate) | 68 | import Data.List(intercalate) |
69 | import Data.Packed.Internal.Numeric(I) | ||
70 | 69 | ||
71 | type ℝ = Double | 70 | type ℝ = Double |
72 | type ℕ = Int | 71 | type ℕ = Int |