11 files changed, 90 insertions, 71 deletions

diff --git a/examples/parallel.hs b/examples/parallel.hs
index 566b729..e875407 100644
--- a/examples/parallel.hs
+++ b/examples/parallel.hs
@@ -1,4 +1,5 @@
--- $ runhaskell parallel.hs 2000
+-- $ ghc --make -O -rtsopts -threaded parallel.hs
+-- $ ./parallel 3000 +RTS -N4 -s -A200M
 
 import System.Environment(getArgs)
 import Numeric.LinearAlgebra
@@ -7,7 +8,6 @@ import System.Time
 
 inParallel = parMap rwhnf id
 
-
 -- matrix product decomposed into p parallel subtasks
 parMul p x y = fromBlocks [ inParallel ( map (x <>) ys ) ]
     where [ys] = toBlocksEvery (rows y) (cols y `div` p) y
@@ -25,3 +25,4 @@ time act = do
     act
     t1 <- getClockTime
     print $ tdSec $ normalizeTimeDiff $ diffClockTimes t1 t0
+
diff --git a/hmatrix.cabal b/hmatrix.cabal
index bfe875d..44ec865 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.12.0.2
+Version:            0.13.0.0
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -27,11 +27,9 @@ cabal-version:      >=1.6
 
 build-type:         Custom
 
-extra-source-files: lib/Numeric/LinearAlgebra/Tests/quickCheckCompat.h
-                    Config.hs THANKS INSTALL CHANGES
+extra-source-files: Config.hs THANKS INSTALL CHANGES
 
-extra-source-files: examples/tests.hs
-                    examples/deriv.hs
+extra-source-files: examples/deriv.hs
                     examples/integrate.hs
                     examples/minimize.hs
                     examples/root.hs
@@ -60,10 +58,6 @@ extra-source-files: examples/tests.hs
 extra-source-files: lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h,
                     lib/Numeric/LinearAlgebra/LAPACK/clapack.h
 
-flag tests
-    description:    Build tests
-    default:        True
-
 flag dd
     description:    svd = zgesdd
     default:        True
@@ -152,12 +146,6 @@ library
        Build-Depends:   binary
        cpp-options:     -DBINARY
 
-    if flag(tests)
-       Build-Depends:   QuickCheck, HUnit, random
-       exposed-modules: Numeric.LinearAlgebra.Tests
-       other-modules:   Numeric.LinearAlgebra.Tests.Instances,
-                        Numeric.LinearAlgebra.Tests.Properties
-
  -- ghc-prof-options:   -auto
 
     ghc-options:        -Wall -fno-warn-missing-signatures
@@ -220,7 +208,5 @@ source-repository head
     type:     git
     location: https://github.com/AlbertoRuiz/hmatrix
 
--- Test-Suite tests
---    type: exitcode-stdio-1.0
---    main-is: examples/tests.hs
+-- The tests are in package hmatrix-tests
 
diff --git a/lib/Numeric/LinearAlgebra/Tests/quickCheckCompat.h b/lib/Numeric/LinearAlgebra/Tests/quickCheckCompat.h
deleted file mode 100644
index 714587b..0000000
--- a/lib/Numeric/LinearAlgebra/Tests/quickCheckCompat.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef MIN_VERSION_QuickCheck
-#define MIN_VERSION_QuickCheck(A,B,C) 1
-#endif
-
-#if MIN_VERSION_QuickCheck(2,0,0)
-import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
-                      ,sized,classify,Testable,Property
-
-                      ,quickCheckWith,maxSize,stdArgs,shrink)
-
-#else
-import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
-                      ,sized,classify,Testable,Property
-
-                      ,check,configSize,defaultConfig,trivial)
-#endif
-
-
-
-#if MIN_VERSION_QuickCheck(2,0,0)
-trivial :: Testable a => Bool -> a -> Property
-trivial = (`classify` "trivial")
-#else
-#endif
-
-
--- define qCheck, which used to be in Tests.hs
-#if MIN_VERSION_QuickCheck(2,0,0)
-qCheck n = quickCheckWith stdArgs {maxSize = n}
-#else
-qCheck n = check defaultConfig {configSize = const n}
-#endif
-
diff --git a/packages/tests/CHANGES b/packages/tests/CHANGES
new file mode 100644
index 0000000..e4e8b2f
--- /dev/null
+++ b/packages/tests/CHANGES
@@ -0,0 +1,5 @@
+0.1
+===
+
+Created a separate testing package.
+
diff --git a/packages/tests/LICENSE b/packages/tests/LICENSE
new file mode 100644
index 0000000..f2125ec
--- /dev/null
+++ b/packages/tests/LICENSE
@@ -0,0 +1,2 @@
+Copyright Alberto Ruiz 2010
+GPL license
diff --git a/packages/tests/Setup.lhs b/packages/tests/Setup.lhs
new file mode 100644
index 0000000..6b32049
--- /dev/null
+++ b/packages/tests/Setup.lhs
@@ -0,0 +1,4 @@
+#! /usr/bin/env runhaskell
+
+> import Distribution.Simple
+> main = defaultMain
diff --git a/packages/tests/hmatrix-tests.cabal b/packages/tests/hmatrix-tests.cabal
new file mode 100644
index 0000000..cd32a4e
--- /dev/null
+++ b/packages/tests/hmatrix-tests.cabal
@@ -0,0 +1,44 @@
+Name:               hmatrix-tests
+Version:            0.1.0.0
+License:            GPL
+License-file:       LICENSE
+Author:             Alberto Ruiz
+Maintainer:         Alberto Ruiz <aruiz@um.es>
+Stability:          provisional
+Homepage:           http://perception.inf.um.es/hmatrix
+Synopsis:           Tests for hmatrix
+Description:        Tests for hmatrix
+Category:           Math
+tested-with:        GHC==7.0.4
+
+cabal-version:      >=1.6
+
+build-type:         Simple
+
+extra-source-files: CHANGES
+                    src/tests.hs
+
+library
+
+    Build-Depends:      base >= 4 && < 5,
+                        hmatrix >= 0.13,
+                        QuickCheck >= 2, HUnit, random
+
+    hs-source-dirs:     src
+
+    exposed-modules:    Numeric.LinearAlgebra.Tests
+
+    other-modules:      Numeric.LinearAlgebra.Tests.Instances,
+                        Numeric.LinearAlgebra.Tests.Properties
+
+    ghc-options:        -Wall -fno-warn-missing-signatures -fno-warn-orphans
+
+
+source-repository head
+    type:     git
+    location: https://github.com/AlbertoRuiz/hmatrix
+
+Test-Suite tests
+    type: exitcode-stdio-1.0
+    main-is: src/tests.hs
+
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index e859450..69ef1b3 100644
--- a/lib/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -3,7 +3,7 @@
 -----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.LinearAlgebra.Tests
-Copyright   :  (c) Alberto Ruiz 2007-9
+Copyright   :  (c) Alberto Ruiz 2007-11
 License     :  GPL-style
 
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -17,11 +17,14 @@ Some tests.
 module Numeric.LinearAlgebra.Tests(
 --  module Numeric.LinearAlgebra.Tests.Instances,
 --  module Numeric.LinearAlgebra.Tests.Properties,
-  qCheck, runTests, runBenchmarks, findNaN
+--  qCheck, 
+   runTests,
+   runBenchmarks
+-- , findNaN
 --, runBigTests
 ) where
 
-import Data.Packed.Random
+--import Data.Packed.Random
 import Numeric.LinearAlgebra
 import Numeric.LinearAlgebra.LAPACK
 import Numeric.LinearAlgebra.Tests.Instances
@@ -38,9 +41,11 @@ import Data.Packed.Development(unsafeFromForeignPtr,unsafeToForeignPtr)
 import Control.Arrow((***))
 import Debug.Trace
 
-#include "Tests/quickCheckCompat.h"
+import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
+                      ,sized,classify,Testable,Property
+                      ,quickCheckWith,maxSize,stdArgs,shrink)
 
-debug x = trace (show x) x
+qCheck n = quickCheckWith stdArgs {maxSize = n}
 
 a ^ b = a Prelude.^ (b :: Int)
 
@@ -343,7 +348,7 @@ lift_maybe m = MaybeT $ do
                         res <- m
                         return $ Just res
 
--- | apply a test to successive elements of a vector, evaluates to true iff test passes for all pairs
+-- apply a test to successive elements of a vector, evaluates to true iff test passes for all pairs
 --successive_ :: Storable a => (a -> a -> Bool) -> Vector a -> Bool
 successive_ t v = maybe False (\_ -> True) $ evalState (runMaybeT (mapVectorM_ stp (subVector 1 (dim v - 1) v))) (v @> 0)
    where stp e  = do
@@ -352,7 +357,7 @@ successive_ t v = maybe False (\_ -> True) $ evalState (runMaybeT (mapVectorM_ s
                      then lift_maybe $ state_put e
                      else (fail "successive_ test failed")
 
--- | operate on successive elements of a vector and return the resulting vector, whose length 1 less than that of the input
+-- operate on successive elements of a vector and return the resulting vector, whose length 1 less than that of the input
 --successive :: (Storable a, Storable b) => (a -> a -> b) -> Vector a -> Vector b
 successive f v = evalState (mapVectorM stp (subVector 1 (dim v - 1) v)) (v @> 0)
    where stp  e = do
@@ -596,20 +601,22 @@ makeUnitary v | realPart n > 1    = v / scalar n
 -- runBigTests :: IO ()
 -- runBigTests = undefined
 
--- testcase for nonempty fpu stack
+{-
+-- | testcase for nonempty fpu stack
 findNaN :: Int -> Bool
 findNaN n = all (bugProp . eye) (take n $ cycle [1..20])
   where eye m = ident m :: Matrix ( Double)
+-}
 
 --------------------------------------------------------------------------------
 
 -- | Performance measurements.
 runBenchmarks :: IO ()
 runBenchmarks = do
-  --cholBench
     solveBench
     subBench
     multBench
+    cholBench
     svdBench
     eigBench
     putStrLn ""
@@ -712,10 +719,11 @@ solveBench = do
 cholBenchN n = do
     let x = uniformSample 777 (2*n) (replicate n (-1,1))
         a = trans x <> x
-    a `seq` putStrLn ""
+    a `seq` putStr ""
     time ("chol " ++ show n) (chol a)
 
 cholBench = do
+    putStrLn ""
     cholBenchN 1200
     cholBenchN 600
     cholBenchN 300
diff --git a/lib/Numeric/LinearAlgebra/Tests/Instances.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs
index 6dd9cfe..647a06c 100644
--- a/lib/Numeric/LinearAlgebra/Tests/Instances.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs
@@ -30,7 +30,9 @@ import System.Random
 
 import Numeric.LinearAlgebra
 import Control.Monad(replicateM)
-#include "quickCheckCompat.h"
+import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
+                      ,sized,classify,Testable,Property
+                      ,quickCheckWith,maxSize,stdArgs,shrink)
 
 #if MIN_VERSION_QuickCheck(2,0,0)
 shrinkListElementwise :: (Arbitrary a) => [a] -> [[a]]
diff --git a/lib/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
index fe13544..c96d3de 100644
--- a/lib/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -46,13 +46,13 @@ module Numeric.LinearAlgebra.Tests.Properties (
 import Numeric.LinearAlgebra --hiding (real,complex)
 import Numeric.LinearAlgebra.LAPACK
 import Debug.Trace
-#include "quickCheckCompat.h"
+import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
+                      ,sized,classify,Testable,Property
+                      ,quickCheckWith,maxSize,stdArgs,shrink)
 
+trivial :: Testable a => Bool -> a -> Property
+trivial = (`classify` "trivial")
 
---real x = real'' x
---complex x = complex'' x
-
-debug x = trace (show x) x
 
 -- relative error
 dist :: (Normed c t, Num (c t)) => c t -> c t -> Double
@@ -227,10 +227,10 @@ rqProp1 m = r <> q |~| m
     where (r,q) = rq m
 
 rqProp2 m = unitary q
-    where (r,q) = rq m
+    where (_r,q) = rq m
 
 rqProp3 m = upperTriang' r
-    where (r,q) = rq m
+    where (r,_q) = rq m
 
 upperTriang' r = upptr (rows r) (cols r) * r |~| r
     where upptr f c = buildMatrix f c $ \(r',c') -> if r'-t > c' then 0 else 1
diff --git a/examples/tests.hs b/packages/tests/src/tests.hs
index 23fd675..23fd675 100644
--- a/examples/tests.hs
+++ b/packages/tests/src/tests.hs