diff options
Diffstat (limited to 'packages/tests')
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs index 5fdc5af..3803f3b 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs | |||
@@ -24,8 +24,8 @@ module Numeric.LinearAlgebra.Tests( | |||
24 | --, runBigTests | 24 | --, runBigTests |
25 | ) where | 25 | ) where |
26 | 26 | ||
27 | --import Data.Packed.Random | ||
28 | import Numeric.LinearAlgebra | 27 | import Numeric.LinearAlgebra |
28 | import Numeric.HMatrix | ||
29 | import Numeric.LinearAlgebra.Util(col,row) | 29 | import Numeric.LinearAlgebra.Util(col,row) |
30 | import Data.Packed | 30 | import Data.Packed |
31 | import Numeric.LinearAlgebra.LAPACK | 31 | import Numeric.LinearAlgebra.LAPACK |
@@ -56,8 +56,8 @@ import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector | |||
56 | 56 | ||
57 | import Test.QuickCheck.Test(isSuccess) | 57 | import Test.QuickCheck.Test(isSuccess) |
58 | 58 | ||
59 | eps = peps :: Double | 59 | --eps = peps :: Double |
60 | i = 0:+1 :: Complex Double | 60 | --i = 0:+1 :: Complex Double |
61 | 61 | ||
62 | qCheck n x = do | 62 | qCheck n x = do |
63 | r <- quickCheckWithResult stdArgs {maxSize = n} x | 63 | r <- quickCheckWithResult stdArgs {maxSize = n} x |
@@ -760,7 +760,7 @@ mkVecBench = do | |||
760 | subBench = do | 760 | subBench = do |
761 | putStrLn "" | 761 | putStrLn "" |
762 | let g = foldl1' (.) (replicate (10^5) (\v -> subVector 1 (dim v -1) v)) | 762 | let g = foldl1' (.) (replicate (10^5) (\v -> subVector 1 (dim v -1) v)) |
763 | time "0.1M subVector " (g (constant 1 (1+10^5) :: Vector Double) @> 0) | 763 | time "0.1M subVector " (g (konst 1 (1+10^5) :: Vector Double) @> 0) |
764 | let f = foldl1' (.) (replicate (10^5) (fromRows.toRows)) | 764 | let f = foldl1' (.) (replicate (10^5) (fromRows.toRows)) |
765 | time "subVector-join 3" (f (ident 3 :: Matrix Double) @@>(0,0)) | 765 | time "subVector-join 3" (f (ident 3 :: Matrix Double) @@>(0,0)) |
766 | time "subVector-join 10" (f (ident 10 :: Matrix Double) @@>(0,0)) | 766 | time "subVector-join 10" (f (ident 10 :: Matrix Double) @@>(0,0)) |
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs index 4f5a5d2..b306f94 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs | |||
@@ -30,7 +30,7 @@ import System.Random | |||
30 | 30 | ||
31 | import Numeric.LinearAlgebra | 31 | import Numeric.LinearAlgebra |
32 | import Numeric.LinearAlgebra.Devel | 32 | import Numeric.LinearAlgebra.Devel |
33 | import Numeric.Container hiding (Testable) | 33 | import Numeric.Container |
34 | import Control.Monad(replicateM) | 34 | import Control.Monad(replicateM) |
35 | import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector | 35 | import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector |
36 | ,sized,classify,Testable,Property | 36 | ,sized,classify,Testable,Property |
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs index 423edaa..f4f1b89 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs | |||
@@ -43,7 +43,7 @@ module Numeric.LinearAlgebra.Tests.Properties ( | |||
43 | linearSolveProp, linearSolveProp2 | 43 | linearSolveProp, linearSolveProp2 |
44 | ) where | 44 | ) where |
45 | 45 | ||
46 | import Numeric.Container hiding (Testable) | 46 | import Numeric.Container |
47 | import Numeric.LinearAlgebra --hiding (real,complex) | 47 | import Numeric.LinearAlgebra --hiding (real,complex) |
48 | import Numeric.LinearAlgebra.LAPACK | 48 | import Numeric.LinearAlgebra.LAPACK |
49 | import Debug.Trace | 49 | import Debug.Trace |