diff options
author | Alberto Ruiz <aruiz@um.es> | 2009-11-14 12:57:52 +0000 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2009-11-14 12:57:52 +0000 |
commit | dc39c11d2d2e75428e6394cf8542c8c3ff2cd887 (patch) | |
tree | 24c5bac27258b5752691316e4d6736a5e0c1d2e5 /lib/Numeric | |
parent | 6bdf5355a26da547b775f29926c131d539e86e7c (diff) |
added module Random.hs
Diffstat (limited to 'lib/Numeric')
-rw-r--r-- | lib/Numeric/LinearAlgebra.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/LinearAlgebra/Tests.hs | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/Numeric/LinearAlgebra.hs b/lib/Numeric/LinearAlgebra.hs index f92c40d..337c007 100644 --- a/lib/Numeric/LinearAlgebra.hs +++ b/lib/Numeric/LinearAlgebra.hs | |||
@@ -16,12 +16,14 @@ This module reexports the most comon functions (including "Numeric.LinearAlgebra | |||
16 | ----------------------------------------------------------------------------- | 16 | ----------------------------------------------------------------------------- |
17 | module Numeric.LinearAlgebra ( | 17 | module Numeric.LinearAlgebra ( |
18 | module Data.Packed, | 18 | module Data.Packed, |
19 | module Data.Packed.Random, | ||
19 | module Numeric.LinearAlgebra.Linear, | 20 | module Numeric.LinearAlgebra.Linear, |
20 | module Numeric.LinearAlgebra.Algorithms, | 21 | module Numeric.LinearAlgebra.Algorithms, |
21 | module Numeric.LinearAlgebra.Interface | 22 | module Numeric.LinearAlgebra.Interface |
22 | ) where | 23 | ) where |
23 | 24 | ||
24 | import Data.Packed | 25 | import Data.Packed |
26 | import Data.Packed.Random | ||
25 | import Numeric.LinearAlgebra.Linear | 27 | import Numeric.LinearAlgebra.Linear |
26 | import Numeric.LinearAlgebra.Algorithms | 28 | import Numeric.LinearAlgebra.Algorithms |
27 | import Numeric.LinearAlgebra.Instances() | 29 | import Numeric.LinearAlgebra.Instances() |
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs index d7c3f99..097756e 100644 --- a/lib/Numeric/LinearAlgebra/Tests.hs +++ b/lib/Numeric/LinearAlgebra/Tests.hs | |||
@@ -131,6 +131,16 @@ rootFindingTest = TestList [ utest "root Hybrids" (fst sol1 ~~ [1,1]) | |||
131 | 131 | ||
132 | --------------------------------------------------------------------- | 132 | --------------------------------------------------------------------- |
133 | 133 | ||
134 | randomTest = c :~1~: snd (meanCov dat) where | ||
135 | a = (3><3) [1,2,3, | ||
136 | 2,4,0, | ||
137 | -2,2,1] | ||
138 | m = 3 |> [1,2,3] | ||
139 | c = a <> trans a | ||
140 | dat = gaussianSample 7 (10^6) m c | ||
141 | |||
142 | --------------------------------------------------------------------- | ||
143 | |||
134 | rot :: Double -> Matrix Double | 144 | rot :: Double -> Matrix Double |
135 | rot a = (3><3) [ c,0,s | 145 | rot a = (3><3) [ c,0,s |
136 | , 0,1,0 | 146 | , 0,1,0 |
@@ -227,6 +237,7 @@ runTests n = do | |||
227 | , utest "polySolve" (polySolveProp [1,2,3,4]) | 237 | , utest "polySolve" (polySolveProp [1,2,3,4]) |
228 | , minimizationTest | 238 | , minimizationTest |
229 | , rootFindingTest | 239 | , rootFindingTest |
240 | , utest "random" randomTest | ||
230 | ] | 241 | ] |
231 | return () | 242 | return () |
232 | 243 | ||