Merge branch 'master' into sundials-clean

6 files changed, 19 insertions, 11 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 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns #-}
+{-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns -fno-warn-missing-signatures #-}
 {- |
 Module      :  Numeric.GLS.Tests
 Copyright   :  (c) Alberto Ruiz 2014
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index 2aefc87..960c777 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-{-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns #-}
+{-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns -fno-warn-missing-signatures #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE FlexibleContexts #-}
@@ -31,7 +31,7 @@ module Numeric.LinearAlgebra.Tests(
 --, runBigTests
 ) where
 
-import Numeric.LinearAlgebra hiding (unitary)
+import Numeric.LinearAlgebra
 import Numeric.LinearAlgebra.Devel
 import Numeric.LinearAlgebra.Static(L)
 import Numeric.LinearAlgebra.Tests.Instances
@@ -514,7 +514,7 @@ indexProp g f x = a1 == g a2 && a2 == a3 && b1 == g b2 && b2 == b3
 
 --------------------------------------------------------------------------------
 
-sliceTest = utest "slice test" $ and
+_sliceTest = utest "slice test" $ and
     [ testSlice (chol . trustSym)  (gen 5 :: Matrix R)
     , testSlice (chol . trustSym)  (gen 5 :: Matrix C)
     , testSlice qr    (rec :: Matrix R)
@@ -617,7 +617,7 @@ sliceTest = utest "slice test" $ and
 
     test_qrgr n t x = qrgr n (QR x t)
 
-    ok_qrgr x = simeq 1E-15 q q'
+    ok_qrgr x = TestCase . assertBool "ok_qrgr" $ simeq 1E-15 q q'
       where
         (q,_) = qr x
         atau = qrRaw x
@@ -646,7 +646,8 @@ sliceTest = utest "slice test" $ and
     rec :: Numeric t => Matrix t
     rec = subMatrix (0,0) (4,5) (gen 5)
 
-    testSlice f x@(size->sz@(r,c)) = all (==f x) (map f (g y1 ++ g y2))
+    testSlice f x@(size->sz@(r,c)) =
+      TestList . map (TestCase . assertEqual "" (f x)) $ (map f (g y1 ++ g y2))
       where
         subm = subMatrix
         g y = [ subm (a*r,b*c) sz y | a <-[0..2], b <- [0..2]]
@@ -841,7 +842,7 @@ runTests n = do
         , staticTest
         , intTest
         , modularTest
-        , sliceTest
+        -- , sliceTest
         ]
     when (errors c + failures c > 0) exitFailure
     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 @@
 {-# LANGUAGE CPP, FlexibleContexts, UndecidableInstances, FlexibleInstances, ScopedTypeVariables #-}
+
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
+
 -----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.LinearAlgebra.Tests.Instances
@@ -62,7 +66,7 @@ instance KnownNat n => Arbitrary (Static.R n) where
         n :: Int
         n = fromIntegral (natVal (Proxy :: Proxy n))
 
-    shrink v = []
+    shrink _v = []
 
 instance (Element a, Arbitrary a) => Arbitrary (Matrix a) where
     arbitrary = do
@@ -89,7 +93,7 @@ instance (KnownNat n, KnownNat m) => Arbitrary (Static.L m n) where
         n :: Int
         n = fromIntegral (natVal (Proxy :: Proxy n))
 
-    shrink mat = []
+    shrink _mat = []
 
 -- a square matrix
 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 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE DataKinds #-}
 
+{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
+
 -----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.LinearAlgebra.Tests.Properties
@@ -51,14 +53,13 @@ module Numeric.LinearAlgebra.Tests.Properties (
   , staticVectorBinaryFailProp
 ) where
 
-import Numeric.LinearAlgebra.HMatrix hiding (Testable,unitary)
+import Numeric.LinearAlgebra.HMatrix hiding (Testable)
 import qualified Numeric.LinearAlgebra.Static as Static
 import Test.QuickCheck
 
 import Data.Binary
 import Data.Binary.Get (runGet)
 import Data.Either (isLeft)
-import Debug.Trace (traceShowId)
 #if MIN_VERSION_base(4,11,0)
 import Prelude hiding ((<>))
 #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 @@
 import Numeric.LinearAlgebra.Tests
 
+main :: IO ()
 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 @@
 import Numeric.GSL.Tests
 
+main :: IO ()
 main = runTests 20