diff options
author | idontgetoutmuch <dominic@steinitz.org> | 2018-04-01 10:25:10 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-01 10:25:10 -0700 |
commit | 7ff1249249cb1b238e3e5ffafdaa9180c86242b9 (patch) | |
tree | 903fa549ea33ae9eff9fb527375f87548948d41d /packages/tests | |
parent | 1bdd94324c6e7cd9d9361c4136998d4c14ea3857 (diff) | |
parent | 63ceed4a69563c08e54269a4a9d3e5d27cb7c489 (diff) |
Merge branch 'master' into master
Diffstat (limited to 'packages/tests')
-rw-r--r-- | packages/tests/src/Numeric/GSL/Tests.hs | 2 | ||||
-rw-r--r-- | packages/tests/src/Numeric/LinearAlgebra/Tests.hs | 8 | ||||
-rw-r--r-- | packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs | 8 | ||||
-rw-r--r-- | packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs | 5 | ||||
-rw-r--r-- | packages/tests/src/TestBase.hs | 1 | ||||
-rw-r--r-- | packages/tests/src/TestGSL.hs | 1 |
6 files changed, 16 insertions, 9 deletions
diff --git a/packages/tests/src/Numeric/GSL/Tests.hs b/packages/tests/src/Numeric/GSL/Tests.hs index 025427b..ed15935 100644 --- a/packages/tests/src/Numeric/GSL/Tests.hs +++ b/packages/tests/src/Numeric/GSL/Tests.hs | |||
@@ -1,4 +1,4 @@ | |||
1 | {-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns #-} | 1 | {-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns -fno-warn-missing-signatures #-} |
2 | {- | | 2 | {- | |
3 | Module : Numeric.GLS.Tests | 3 | Module : Numeric.GLS.Tests |
4 | Copyright : (c) Alberto Ruiz 2014 | 4 | Copyright : (c) Alberto Ruiz 2014 |
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs index c146e93..960c777 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs | |||
@@ -1,5 +1,5 @@ | |||
1 | {-# LANGUAGE CPP #-} | 1 | {-# LANGUAGE CPP #-} |
2 | {-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns #-} | 2 | {-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns -fno-warn-missing-signatures #-} |
3 | {-# LANGUAGE DataKinds #-} | 3 | {-# LANGUAGE DataKinds #-} |
4 | {-# LANGUAGE TypeFamilies #-} | 4 | {-# LANGUAGE TypeFamilies #-} |
5 | {-# LANGUAGE FlexibleContexts #-} | 5 | {-# LANGUAGE FlexibleContexts #-} |
@@ -31,7 +31,7 @@ module Numeric.LinearAlgebra.Tests( | |||
31 | --, runBigTests | 31 | --, runBigTests |
32 | ) where | 32 | ) where |
33 | 33 | ||
34 | import Numeric.LinearAlgebra hiding (unitary) | 34 | import Numeric.LinearAlgebra |
35 | import Numeric.LinearAlgebra.Devel | 35 | import Numeric.LinearAlgebra.Devel |
36 | import Numeric.LinearAlgebra.Static(L) | 36 | import Numeric.LinearAlgebra.Static(L) |
37 | import Numeric.LinearAlgebra.Tests.Instances | 37 | import Numeric.LinearAlgebra.Tests.Instances |
@@ -514,7 +514,7 @@ indexProp g f x = a1 == g a2 && a2 == a3 && b1 == g b2 && b2 == b3 | |||
514 | 514 | ||
515 | -------------------------------------------------------------------------------- | 515 | -------------------------------------------------------------------------------- |
516 | 516 | ||
517 | sliceTest = TestLabel "slice test" . TestList $ | 517 | _sliceTest = utest "slice test" $ and |
518 | [ testSlice (chol . trustSym) (gen 5 :: Matrix R) | 518 | [ testSlice (chol . trustSym) (gen 5 :: Matrix R) |
519 | , testSlice (chol . trustSym) (gen 5 :: Matrix C) | 519 | , testSlice (chol . trustSym) (gen 5 :: Matrix C) |
520 | , testSlice qr (rec :: Matrix R) | 520 | , testSlice qr (rec :: Matrix R) |
@@ -842,7 +842,7 @@ runTests n = do | |||
842 | , staticTest | 842 | , staticTest |
843 | , intTest | 843 | , intTest |
844 | , modularTest | 844 | , modularTest |
845 | , sliceTest | 845 | -- , sliceTest |
846 | ] | 846 | ] |
847 | when (errors c + failures c > 0) exitFailure | 847 | when (errors c + failures c > 0) exitFailure |
848 | return () | 848 | return () |
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs index f0bddd0..59230e0 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs | |||
@@ -1,4 +1,8 @@ | |||
1 | {-# LANGUAGE CPP, FlexibleContexts, UndecidableInstances, FlexibleInstances, ScopedTypeVariables #-} | 1 | {-# LANGUAGE CPP, FlexibleContexts, UndecidableInstances, FlexibleInstances, ScopedTypeVariables #-} |
2 | |||
3 | {-# OPTIONS_GHC -fno-warn-orphans #-} | ||
4 | {-# OPTIONS_GHC -fno-warn-missing-signatures #-} | ||
5 | |||
2 | ----------------------------------------------------------------------------- | 6 | ----------------------------------------------------------------------------- |
3 | {- | | 7 | {- | |
4 | Module : Numeric.LinearAlgebra.Tests.Instances | 8 | Module : Numeric.LinearAlgebra.Tests.Instances |
@@ -62,7 +66,7 @@ instance KnownNat n => Arbitrary (Static.R n) where | |||
62 | n :: Int | 66 | n :: Int |
63 | n = fromIntegral (natVal (Proxy :: Proxy n)) | 67 | n = fromIntegral (natVal (Proxy :: Proxy n)) |
64 | 68 | ||
65 | shrink v = [] | 69 | shrink _v = [] |
66 | 70 | ||
67 | instance (Element a, Arbitrary a) => Arbitrary (Matrix a) where | 71 | instance (Element a, Arbitrary a) => Arbitrary (Matrix a) where |
68 | arbitrary = do | 72 | arbitrary = do |
@@ -89,7 +93,7 @@ instance (KnownNat n, KnownNat m) => Arbitrary (Static.L m n) where | |||
89 | n :: Int | 93 | n :: Int |
90 | n = fromIntegral (natVal (Proxy :: Proxy n)) | 94 | n = fromIntegral (natVal (Proxy :: Proxy n)) |
91 | 95 | ||
92 | shrink mat = [] | 96 | shrink _mat = [] |
93 | 97 | ||
94 | -- a square matrix | 98 | -- a square matrix |
95 | newtype (Sq a) = Sq (Matrix a) deriving Show | 99 | newtype (Sq a) = Sq (Matrix a) deriving Show |
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs index e3a6242..6cd3a9e 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs | |||
@@ -3,6 +3,8 @@ | |||
3 | {-# LANGUAGE TypeFamilies #-} | 3 | {-# LANGUAGE TypeFamilies #-} |
4 | {-# LANGUAGE DataKinds #-} | 4 | {-# LANGUAGE DataKinds #-} |
5 | 5 | ||
6 | {-# OPTIONS_GHC -fno-warn-missing-signatures #-} | ||
7 | |||
6 | ----------------------------------------------------------------------------- | 8 | ----------------------------------------------------------------------------- |
7 | {- | | 9 | {- | |
8 | Module : Numeric.LinearAlgebra.Tests.Properties | 10 | Module : Numeric.LinearAlgebra.Tests.Properties |
@@ -51,14 +53,13 @@ module Numeric.LinearAlgebra.Tests.Properties ( | |||
51 | , staticVectorBinaryFailProp | 53 | , staticVectorBinaryFailProp |
52 | ) where | 54 | ) where |
53 | 55 | ||
54 | import Numeric.LinearAlgebra.HMatrix hiding (Testable,unitary) | 56 | import Numeric.LinearAlgebra.HMatrix hiding (Testable) |
55 | import qualified Numeric.LinearAlgebra.Static as Static | 57 | import qualified Numeric.LinearAlgebra.Static as Static |
56 | import Test.QuickCheck | 58 | import Test.QuickCheck |
57 | 59 | ||
58 | import Data.Binary | 60 | import Data.Binary |
59 | import Data.Binary.Get (runGet) | 61 | import Data.Binary.Get (runGet) |
60 | import Data.Either (isLeft) | 62 | import Data.Either (isLeft) |
61 | import Debug.Trace (traceShowId) | ||
62 | #if MIN_VERSION_base(4,11,0) | 63 | #if MIN_VERSION_base(4,11,0) |
63 | import Prelude hiding ((<>)) | 64 | import Prelude hiding ((<>)) |
64 | #endif | 65 | #endif |
diff --git a/packages/tests/src/TestBase.hs b/packages/tests/src/TestBase.hs index 23fd675..51867b1 100644 --- a/packages/tests/src/TestBase.hs +++ b/packages/tests/src/TestBase.hs | |||
@@ -1,3 +1,4 @@ | |||
1 | import Numeric.LinearAlgebra.Tests | 1 | import Numeric.LinearAlgebra.Tests |
2 | 2 | ||
3 | main :: IO () | ||
3 | main = runTests 20 | 4 | main = runTests 20 |
diff --git a/packages/tests/src/TestGSL.hs b/packages/tests/src/TestGSL.hs index 112422d..cc6b1e7 100644 --- a/packages/tests/src/TestGSL.hs +++ b/packages/tests/src/TestGSL.hs | |||
@@ -1,3 +1,4 @@ | |||
1 | import Numeric.GSL.Tests | 1 | import Numeric.GSL.Tests |
2 | 2 | ||
3 | main :: IO () | ||
3 | main = runTests 20 | 4 | main = runTests 20 |