fix tests

3 files changed, 11 insertions, 9 deletions

diff --git a/packages/tests/src/Numeric/GSL/Tests.hs b/packages/tests/src/Numeric/GSL/Tests.hs
index 2e225b6..e5d205d 100644
--- a/packages/tests/src/Numeric/GSL/Tests.hs
+++ b/packages/tests/src/Numeric/GSL/Tests.hs
@@ -42,7 +42,7 @@ fittingTest = utest "levmar" (ok1 && ok2)
     sol = fst $ fitModel 1E-4 1E-4 20 (expModel, expModelDer) dat [1,0,0]
 
     ok1 = and (zipWith f sols [5,0.1,1]) where f (x,d) r = abs (x-r)<2*d
-    ok2 = norm2 (fromList (map fst sols) - fromList sol) < 1E-5
+    ok2 = norm_2 (fromList (map fst sols) - fromList sol) < 1E-5
 
 ---------------------------------------------------------------------
 
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index 14d02e4..a25f4cb 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -1,9 +1,9 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-incomplete-patterns #-}
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE GADTs #-}
-
+{-# LANGUAGE RankNTypes #-}
 
 -----------------------------------------------------------------------------
 {- |
@@ -30,7 +30,7 @@ module Numeric.LinearAlgebra.Tests(
 
 import Numeric.LinearAlgebra.HMatrix
 import Numeric.LinearAlgebra.Devel hiding (vec)
-import Numeric.LinearAlgebra.Util hiding (ones)
+import Numeric.LinearAlgebra.HMatrix.Util
 import Numeric.LinearAlgebra.Static(L)
 import Numeric.LinearAlgebra.Tests.Instances
 import Numeric.LinearAlgebra.Tests.Properties
@@ -52,6 +52,7 @@ import Control.Monad(ap)
 import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
                       ,sized,classify,Testable,Property
                       ,quickCheckWithResult,maxSize,stdArgs,shrink)
+import qualified Test.QuickCheck as T
 
 import Test.QuickCheck.Test(isSuccess)
 
@@ -413,7 +414,8 @@ indexProp g f x = a1 == g a2 && a2 == a3 && b1 == g b2 && b2 == b3
 runTests :: Int  -- ^ maximum dimension
          -> IO ()
 runTests n = do
-    let test p = qCheck n p
+    let test :: forall t . T.Testable t => t -> IO ()
+        test p = qCheck n p
     putStrLn "------ index"
     test( \m -> indexProp id flatten (single (m :: RM)) )
     test( \v -> indexProp id id (single (v :: Vector Double)) )
@@ -485,7 +487,7 @@ runTests n = do
     test (svdProp6b)
     test (svdProp7  . rM)
     test (svdProp7  . cM)
-    putStrLn "------ svdCd"
+--    putStrLn "------ svdCd"
 #ifdef NOZGESDD
 --    putStrLn "Omitted"
 #else
@@ -532,7 +534,7 @@ runTests n = do
     test (\u -> sin u ** 2 + cos u ** 2 |~| (1::RM))
     test (\u -> cos u * tan u |~| sin (u::RM))
     test $ (\u -> cos u * tan u |~| sin (u::CM)) . liftMatrix makeUnitary
-    putStrLn "------ vector operations - Float"
+--    putStrLn "------ vector operations - Float"
 --    test (\u -> sin u ^ 2 + cos u ^ 2 |~~| (1::FM))
 --    test $ (\u -> sin u ^ 2 + cos u ^ 2 |~~| (1::ZM)) . liftMatrix makeUnitary
 --    test (\u -> sin u ** 2 + cos u ** 2 |~~| (1::FM))
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
index d9645c3..941f747 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP, FlexibleContexts #-}
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE TypeFamilies #-}
 
 -----------------------------------------------------------------------------
 {- |
@@ -272,5 +272,5 @@ linearSolveProp2 f (a,x) = not wc `trivial` (not wc || a <> f a b |~| b)
           b = a <> x
           wc = rank a == q
 
-subProp m = m == (tr . fromColumns . toRows) m
+subProp m = m == (conj . tr . fromColumns . toRows) m