diff options
author | Alberto Ruiz <aruiz@um.es> | 2017-12-26 14:05:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-26 14:05:35 +0100 |
commit | 0d4018b09f1d38bbc05fdc0d8197d0f8a6ce5571 (patch) | |
tree | f7aae740fa7129c4641cf05a9e00260e48cd92bb /packages/tests/src/Numeric | |
parent | 87c7682bbfd17308749d5e9568f1ffa25390ce79 (diff) | |
parent | e83e2023da77ecaa9aaba15bc9bd48757f73b3a9 (diff) |
Merge pull request #245 from konn/ghc84
Workaround for GHC-8.4.x
Diffstat (limited to 'packages/tests/src/Numeric')
3 files changed, 12 insertions, 2 deletions
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs index 6d54f4d..2aefc87 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs | |||
@@ -39,7 +39,11 @@ import Numeric.LinearAlgebra.Tests.Properties | |||
39 | import Test.HUnit hiding ((~:),test,Testable,State) | 39 | import Test.HUnit hiding ((~:),test,Testable,State) |
40 | import System.Info | 40 | import System.Info |
41 | import Data.List(foldl1') | 41 | import Data.List(foldl1') |
42 | #if MIN_VERSION_base(4,11,0) | ||
43 | import Prelude hiding ((^),(<>)) | ||
44 | #else | ||
42 | import Prelude hiding ((^)) | 45 | import Prelude hiding ((^)) |
46 | #endif | ||
43 | import qualified Prelude | 47 | import qualified Prelude |
44 | import System.CPUTime | 48 | import System.CPUTime |
45 | import System.Exit | 49 | import System.Exit |
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs index 37f7da2..f0bddd0 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs | |||
@@ -1,4 +1,4 @@ | |||
1 | {-# LANGUAGE FlexibleContexts, UndecidableInstances, FlexibleInstances, ScopedTypeVariables #-} | 1 | {-# LANGUAGE CPP, FlexibleContexts, UndecidableInstances, FlexibleInstances, ScopedTypeVariables #-} |
2 | ----------------------------------------------------------------------------- | 2 | ----------------------------------------------------------------------------- |
3 | {- | | 3 | {- | |
4 | Module : Numeric.LinearAlgebra.Tests.Instances | 4 | Module : Numeric.LinearAlgebra.Tests.Instances |
@@ -32,7 +32,9 @@ import Test.QuickCheck(Arbitrary,arbitrary,choose,vector,sized,shrink) | |||
32 | import GHC.TypeLits | 32 | import GHC.TypeLits |
33 | import Data.Proxy (Proxy(..)) | 33 | import Data.Proxy (Proxy(..)) |
34 | import qualified Numeric.LinearAlgebra.Static as Static | 34 | import qualified Numeric.LinearAlgebra.Static as Static |
35 | 35 | #if MIN_VERSION_base(4,11,0) | |
36 | import Prelude hiding ((<>)) | ||
37 | #endif | ||
36 | 38 | ||
37 | shrinkListElementwise :: (Arbitrary a) => [a] -> [[a]] | 39 | shrinkListElementwise :: (Arbitrary a) => [a] -> [[a]] |
38 | shrinkListElementwise [] = [] | 40 | shrinkListElementwise [] = [] |
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs index 0de9f37..e3a6242 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs | |||
@@ -1,3 +1,4 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
1 | {-# LANGUAGE FlexibleContexts #-} | 2 | {-# LANGUAGE FlexibleContexts #-} |
2 | {-# LANGUAGE TypeFamilies #-} | 3 | {-# LANGUAGE TypeFamilies #-} |
3 | {-# LANGUAGE DataKinds #-} | 4 | {-# LANGUAGE DataKinds #-} |
@@ -58,6 +59,9 @@ import Data.Binary | |||
58 | import Data.Binary.Get (runGet) | 59 | import Data.Binary.Get (runGet) |
59 | import Data.Either (isLeft) | 60 | import Data.Either (isLeft) |
60 | import Debug.Trace (traceShowId) | 61 | import Debug.Trace (traceShowId) |
62 | #if MIN_VERSION_base(4,11,0) | ||
63 | import Prelude hiding ((<>)) | ||
64 | #endif | ||
61 | 65 | ||
62 | (~=) :: Double -> Double -> Bool | 66 | (~=) :: Double -> Double -> Bool |
63 | a ~= b = abs (a - b) < 1e-10 | 67 | a ~= b = abs (a - b) < 1e-10 |