diff options
author | Alberto Ruiz <aruiz@um.es> | 2015-04-15 19:53:15 +0200 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2015-04-15 19:53:15 +0200 |
commit | 27c1c4c1b4acd6ccfb53cfef5687bfda1b99d81c (patch) | |
tree | df6a33476fb10a4c2e9b89d4e3f5c8330dc997bf /packages/tests | |
parent | 6ecaa30249548c44199ddbc3cce6f8228b17be5b (diff) |
remove Util
Diffstat (limited to 'packages/tests')
-rw-r--r-- | packages/tests/src/Numeric/LinearAlgebra/Tests.hs | 21 | ||||
-rw-r--r-- | packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs | 2 |
2 files changed, 2 insertions, 21 deletions
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs index cf0f581..71c7c16 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs | |||
@@ -28,9 +28,8 @@ module Numeric.LinearAlgebra.Tests( | |||
28 | --, runBigTests | 28 | --, runBigTests |
29 | ) where | 29 | ) where |
30 | 30 | ||
31 | import Numeric.LinearAlgebra.HMatrix | 31 | import Numeric.LinearAlgebra hiding (unitary) |
32 | import Numeric.LinearAlgebra.Devel hiding (vec) | 32 | import Numeric.LinearAlgebra.Devel hiding (vec) |
33 | import Numeric.LinearAlgebra.HMatrix.Util | ||
34 | import Numeric.LinearAlgebra.Static(L) | 33 | import Numeric.LinearAlgebra.Static(L) |
35 | import Numeric.LinearAlgebra.Tests.Instances | 34 | import Numeric.LinearAlgebra.Tests.Instances |
36 | import Numeric.LinearAlgebra.Tests.Properties | 35 | import Numeric.LinearAlgebra.Tests.Properties |
@@ -372,23 +371,6 @@ convolutionTest = utest "convolution" ok | |||
372 | 371 | ||
373 | -------------------------------------------------------------------------------- | 372 | -------------------------------------------------------------------------------- |
374 | 373 | ||
375 | kroneckerTest = utest "kronecker" ok | ||
376 | where | ||
377 | a,x,b :: Matrix Double | ||
378 | a = (3><4) [1..] | ||
379 | x = (4><2) [3,5..] | ||
380 | b = (2><5) [0,5..] | ||
381 | v1 = vec (a <> x <> b) | ||
382 | v2 = (tr b `kronecker` a) #> vec x | ||
383 | s = tr b <> b | ||
384 | v3 = vec s | ||
385 | v4 = (dup 5 :: Matrix Double) #> vech s | ||
386 | ok = v1 == v2 && v3 == v4 | ||
387 | && vtrans 1 a == tr a | ||
388 | && vtrans (rows a) a == asColumn (vec a) | ||
389 | |||
390 | -------------------------------------------------------------------------------- | ||
391 | |||
392 | sparseTest = utest "sparse" (fst $ checkT (undefined :: GMatrix)) | 374 | sparseTest = utest "sparse" (fst $ checkT (undefined :: GMatrix)) |
393 | 375 | ||
394 | -------------------------------------------------------------------------------- | 376 | -------------------------------------------------------------------------------- |
@@ -583,7 +565,6 @@ runTests n = do | |||
583 | , conformTest | 565 | , conformTest |
584 | , accumTest | 566 | , accumTest |
585 | , convolutionTest | 567 | , convolutionTest |
586 | , kroneckerTest | ||
587 | , sparseTest | 568 | , sparseTest |
588 | , staticTest | 569 | , staticTest |
589 | ] | 570 | ] |
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs index e2492dd..207a303 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs | |||
@@ -42,7 +42,7 @@ module Numeric.LinearAlgebra.Tests.Properties ( | |||
42 | linearSolveProp, linearSolveProp2 | 42 | linearSolveProp, linearSolveProp2 |
43 | ) where | 43 | ) where |
44 | 44 | ||
45 | import Numeric.LinearAlgebra.HMatrix hiding (Testable)--hiding (real,complex) | 45 | import Numeric.LinearAlgebra.HMatrix hiding (Testable,unitary) |
46 | import Test.QuickCheck | 46 | import Test.QuickCheck |
47 | 47 | ||
48 | trivial :: Testable a => Bool -> a -> Property | 48 | trivial :: Testable a => Bool -> a -> Property |