From 9c4406534e826badee79b1fe585c9c11f0fa01a5 Mon Sep 17 00:00:00 2001
From: Alberto Ruiz <aruiz@um.es>
Date: Thu, 22 May 2014 11:50:06 +0200
Subject: sparse test, fix peps in rank test

---
 packages/tests/src/Numeric/LinearAlgebra/Tests.hs            | 11 ++++++++---
 packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs  |  2 +-
 packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'packages/tests/src/Numeric')

diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index 55a805a..5fdc5af 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -25,8 +25,8 @@ module Numeric.LinearAlgebra.Tests(
 ) where
 
 --import Data.Packed.Random
-import Numeric.LinearAlgebra.Compat
-import Numeric.LinearAlgebra.Util(row,col)
+import Numeric.LinearAlgebra
+import Numeric.LinearAlgebra.Util(col,row)
 import Data.Packed
 import Numeric.LinearAlgebra.LAPACK
 import Numeric.LinearAlgebra.Tests.Instances
@@ -56,6 +56,9 @@ import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
 
 import Test.QuickCheck.Test(isSuccess)
 
+eps = peps :: Double
+i = 0:+1 :: Complex Double
+
 qCheck n x = do
     r <- quickCheckWithResult stdArgs {maxSize = n} x
     when (not $ isSuccess r) (exitFailure)
@@ -473,6 +476,7 @@ kroneckerTest = utest "kronecker" ok
 
 --------------------------------------------------------------------------------
 
+sparseTest = utest "sparse mul" (fst $ checkT (undefined :: SMatrix))
 
 
 -- | All tests must pass with a maximum dimension of about 20
@@ -632,7 +636,7 @@ runTests n = do
         , utest "buildVector/Matrix" $
                         complex (10 |> [0::Double ..]) == buildVector 10 fromIntegral
                      && ident 5 == buildMatrix 5 5 (\(r,c) -> if r==c then 1::Double else 0)
-        , utest "rank" $  rank ((2><3)[1,0,0,1,6*eps,0]) == 1
+        , utest "rank" $  rank ((2><3)[1,0,0,1,5*eps,0]) == 1
                        && rank ((2><3)[1,0,0,1,7*eps,0]) == 2
         , utest "block" $ fromBlocks [[ident 3,0],[0,ident 4]] == (ident 7 :: CM)
         , odeTest
@@ -650,6 +654,7 @@ runTests n = do
         , accumTest
         , convolutionTest
         , kroneckerTest
+        , sparseTest
         ]
     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 b306f94..4f5a5d2 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs
@@ -30,7 +30,7 @@ import System.Random
 
 import Numeric.LinearAlgebra
 import Numeric.LinearAlgebra.Devel
-import Numeric.Container
+import Numeric.Container hiding (Testable)
 import Control.Monad(replicateM)
 import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
                       ,sized,classify,Testable,Property
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
index 70d36e8..110ed24 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -43,7 +43,7 @@ module Numeric.LinearAlgebra.Tests.Properties (
     linearSolveProp, linearSolveProp2
 ) where
 
-import Numeric.LinearAlgebra.Compat --hiding (real,complex)
+import Numeric.LinearAlgebra.Compat hiding (Testable) --hiding (real,complex)
 import Numeric.LinearAlgebra.LAPACK
 import Debug.Trace
 import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
-- 
cgit v1.2.3