3 files changed, 177 insertions, 491 deletions

diff --git a/examples/tests.hs b/examples/tests.hs
index b6c9a36..cd923cd 100644
--- a/examples/tests.hs
+++ b/examples/tests.hs
@@ -1,138 +1,13 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
-
 module Main where
 
-import Numeric.GSL hiding (sin,cos,exp,choose)
 import Numeric.LinearAlgebra
-import Numeric.LinearAlgebra.LAPACK
-import qualified Numeric.GSL.Matrix as GSL
-import Test.QuickCheck hiding (test)
-import Test.HUnit hiding ((~:),test)
+import Numeric.LinearAlgebra.Tests
 import System.Random(randomRs,mkStdGen)
-import System.Info
-import Data.List(foldl1', transpose)
+import Test.HUnit hiding (test)
 import System(getArgs)
-import Debug.Trace(trace)
-
-debug x = trace (show x) x
-
-type RM = Matrix Double
-type CM = Matrix (Complex Double)
-
--- relative error
-dist :: (Normed t, Num t) => t -> t -> Double
-dist a b = r
-    where norm = pnorm Infinity
-          na = norm a
-          nb = norm b
-          nab = norm (a-b)
-          mx = max na nb
-          mn = min na nb
-          r = if mn < eps
-                then mx
-                else nab/mx
-
-infixl 4 |~|
-a |~| b = a :~10~: b
-
-data Aprox a = (:~) a Int
-
-(~:) :: (Normed a, Num a) => Aprox a -> a -> Bool
-a :~n~: b = dist a b < 10^^(-n)
-
-
-maxdim = 10
-
-instance (Arbitrary a, RealFloat a) => Arbitrary (Complex a) where
-    arbitrary = do
-        r <- arbitrary
-        i <- arbitrary
-        return (r:+i)
-    coarbitrary = undefined
-
-instance (Element a, Arbitrary a) => Arbitrary (Matrix a) where 
-   arbitrary = do --m <- sized $ \max -> choose (1,1+3*max)
-                  m <- choose (1,maxdim)
-                  n <- choose (1,maxdim)
-                  l <- vector (m*n)
-                  ctype <- arbitrary
-                  let h = if ctype then (m><n) else (m>|<n)
-                  trMode <- arbitrary
-                  let tr = if trMode then trans else id
-                  return $ tr (h l)
-   coarbitrary = undefined
-
-data PairM a = PairM (Matrix a) (Matrix a) deriving Show
-instance (Num a, Element a, Arbitrary a) => Arbitrary (PairM a) where
-    arbitrary = do
-        a <- choose (1,maxdim)
-        b <- choose (1,maxdim)
-        c <- choose (1,maxdim)
-        l1 <- vector (a*b)
-        l2 <- vector (b*c)
-        return $ PairM ((a><b) (map fromIntegral (l1::[Int]))) ((b><c) (map fromIntegral (l2::[Int])))
-        --return $ PairM ((a><b) l1) ((b><c) l2)
-    coarbitrary = undefined
-
-data SqM a = SqM (Matrix a) deriving Show
-sqm (SqM a) = a
-instance (Element a, Arbitrary a) => Arbitrary (SqM a) where
-    arbitrary = do
-        n <- choose (1,maxdim)
-        l <- vector (n*n)
-        return $ SqM $ (n><n) l
-    coarbitrary = undefined
-
-data Sym a = Sym (Matrix a) deriving Show
-sym (Sym a) = a
-instance (Linear Vector a, Arbitrary a) => Arbitrary (Sym a) where
-    arbitrary = do
-        SqM m <- arbitrary
-        return $ Sym (m + trans m)
-    coarbitrary = undefined
 
-data Her = Her (Matrix (Complex Double)) deriving Show
-her (Her a) = a
-instance {-(Field a, Arbitrary a, Num a) =>-} Arbitrary Her where
-    arbitrary = do
-        SqM m <- arbitrary
-        return $ Her (m + ctrans m)
-    coarbitrary = undefined
 
-data PairSM a = PairSM (Matrix a) (Matrix a) deriving Show
-instance (Num a, Field a, Arbitrary a) => Arbitrary (PairSM a) where
-    arbitrary = do
-        a <- choose (1,maxdim)
-        c <- choose (1,maxdim)
-        l1 <- vector (a*a)
-        l2 <- vector (a*c)
-        return $ PairSM ((a><a) (map fromIntegral (l1::[Int]))) ((a><c) (map fromIntegral (l2::[Int])))
-        --return $ PairSM ((a><a) l1) ((a><c) l2)
-    coarbitrary = undefined
-
-instance (Field a, Arbitrary a) => Arbitrary (Vector a) where 
-   arbitrary = do --m <- sized $ \max -> choose (1,1+3*max)
-                  m <- choose (1,maxdim^2)
-                  l <- vector m
-                  return $ fromList l
-   coarbitrary = undefined
-
-data PairV a = PairV (Vector a) (Vector a)
-instance (Field a, Arbitrary a) => Arbitrary (PairV a) where 
-   arbitrary = do --m <- sized $ \max -> choose (1,1+3*max)
-                  m <- choose (1,maxdim^2)
-                  l1 <- vector m
-                  l2 <- vector m
-                  return $ PairV (fromList l1) (fromList l2)
-   coarbitrary = undefined
-
-----------------------------------------------------------------------
-
-test str b = TestCase $ assertBool str b
-
-----------------------------------------------------------------------
-
-pseudorandomR seed (n,m) = reshape m $ fromList $ take (n*m) $ randomRs (-100,100) $ mkStdGen seed 
+pseudorandomR seed (n,m) = reshape m $ fromList $ take (n*m) $ randomRs (-100,100) $ mkStdGen seed
 
 pseudorandomC seed (n,m) = toComplex (pseudorandomR seed (n,m), pseudorandomR (seed+1) (n,m))
 
@@ -141,366 +16,23 @@ bigmat = m + trans m :: RM
 bigmatc = mc + ctrans mc ::CM
     where mc = pseudorandomC 19 (1000,1000)
 
-----------------------------------------------------------------------
-
-
-m = (3><3)
- [ 1, 2, 3
- , 4, 5, 7
- , 2, 8, 4 :: Double
- ]
-
-mc = (3><3)
- [ 1, 2, 3
- , 4, 5, 7
- , 2, 8, i
- ]
-
-
-mr = (3><4)
- [ 1, 2, 3, 4,
-   2, 4, 6, 8,
-   1, 1, 1, 2:: Double
- ]
-
-mrc = (3><4)
- [ 1, 2, 3, 4,
-   2, 4, 6, 8,
-   i, i, i, 2
- ]
-
-a = (3><4)
- [ 1, 0, 0, 0
- , 0, 2, 0, 0
- , 0, 0, 0, 0 :: Double
- ]
-
-b = (3><4)
- [ 1, 0, 0, 0
- , 0, 2, 3, 0
- , 0, 0, 4, 0 :: Double
- ]
-
-ac = (2><3) [1 .. 6::Double]
-bc = (3><4) [7 .. 18::Double]
-
-af = (2>|<3) [1,4,2,5,3,6::Double]
-bf = (3>|<4) [7,11,15,8,12,16,9,13,17,10,14,18::Double]
-
--------------------------------------------------------
+utest str b = TestCase $ assertBool str b
 
 feye n = flipud (ident n) :: Matrix Double
 
-
-luTest1 m = m |~| p <> l <> u
-    where (l,u,p,_) = lu m
-
-detTest1 = det m == 26
-        && det mc == 38 :+ (-3)
-        && det (feye 2) == -1
-
-detTest2 m = s d1 |~| s d2
-    where d1 = det m
-          d2 = det' m * det q
-          det' m = product $ toList $ takeDiag r
-          (q,r) = qr m
-          s x = fromList [x]
-
-invTest m = degenerate m || m <> inv m |~| ident (rows m)
-
-pinvTest m =  m <> p <> m |~| m
-           && p <> m <> p |~| p
-           && hermitian (m<>p)
-           && hermitian (p<>m)
-    where p = pinv m
-
-square m = rows m == cols m
-
-unitary m = square m && m <> ctrans m |~| ident (rows m)
-
-hermitian m = m |~| ctrans m
-
-upperTriang m = rows m == 1 || down == z
-    where down = fromList $ concat $ zipWith drop [1..] (toLists (ctrans m))
-          z = constant 0 (dim down)
-
-upperHessenberg m = rows m < 3 || down == z
-    where down = fromList $ concat $ zipWith drop [2..] (toLists (ctrans m))
-          z = constant 0 (dim down)
-
-svdTest svd m = u <> real d <> trans v |~| m
-          && unitary u && unitary v
-    where (u,d,v) = full svd m
-
-svdTest' svd m = m |~| 0 || u <> real (diag s) <> trans v |~| m
-    where (u,s,v) = economy svd m
-
-eigTest m = complex m <> v |~| v <> diag s
-    where (s, v) = eig m
-
-eigTestSH m = m <> v |~| v <> real (diag s)
-              && unitary v
-              && m |~| v <> real (diag s) <> ctrans v
-    where (s, v) = eigSH m
-
-zeros (r,c) = reshape c (constant 0 (r*c))
-
-ones (r,c) = zeros (r,c) + 1
-
-degenerate m = rank m < min (rows m) (cols m) 
-
-prec = 1E-15
-
-singular m = s1 < prec || s2/s1 < prec
-    where (_,ss,_) = svd m
-          s = toList ss
-          s1 = maximum s
-          s2 = minimum s
-
-nullspaceTest m = null nl || m <> n |~| zeros (r,c) -- 0
-    where nl = nullspacePrec 1 m
-          n = fromColumns nl
-          r = rows m
-          c = cols m - rank m
-
---------------------------------------------------------------------
-
-polyEval cs x = foldr (\c ac->ac*x+c) 0 cs
-
-polySolveTest' p = length p <2 || last p == 0|| 1E-8 > maximum (map magnitude $ map (polyEval (map (:+0) p)) (polySolve p))
-
-
-polySolveTest = test "polySolve" (polySolveTest' [1,2,3,4])
-
----------------------------------------------------------------------
-
-quad f a b = fst $ integrateQAGS 1E-9 100 f a b
-
--- A multiple integral can be easily defined using partial application
-quad2 f a b g1 g2 = quad h a b
-    where h x = quad (f x) (g1 x) (g2 x)
-
-volSphere r = 8 * quad2 (\x y -> sqrt (r*r-x*x-y*y)) 
-                        0 r (const 0) (\x->sqrt (r*r-x*x))
-
-epsTol = 1E-8::Double
-
-integrateTest = test "integrate" (abs (volSphere 2.5 - 4/3*pi*2.5^3) < epsTol)
-
----------------------------------------------------------------------
-
-besselTest = test "bessel_J0_e" ( abs (r-expected) < e )
-    where (r,e) = bessel_J0_e 5.0
-          expected = -0.17759677131433830434739701
-
-exponentialTest = test "exp_e10_e" ( abs (v*10^e - expected) < 4E-2 )
-    where (v,e,err) = exp_e10_e 30.0
-          expected = exp 30.0
-
-gammaTest = test "gamma" (gamma 5 == 24.0)
-
----------------------------------------------------------------------
-
-cholRTest = chol ((2><2) [1,2,2,9::Double]) == (2><2) [1,2,0,2.23606797749979]
-cholCTest = chol ((2><2) [1,2,2,9::Complex Double]) == (2><2) [1,2,0,2.23606797749979]
-
----------------------------------------------------------------------
-
-qrTest qr m = q <> r |~| m && unitary q && upperTriang r
-    where (q,r) = qr m
-
----------------------------------------------------------------------
-
-hessTest m = m |~| p <> h <> ctrans p && unitary p && upperHessenberg h
-    where (p,h) = hess m
-
----------------------------------------------------------------------
-
-schurTest1 m = m |~| u <> s <> ctrans u && unitary u && upperTriang s
-    where (u,s) = schur m
-
-schurTest2 m = m |~| u <> s <> ctrans u && unitary u && upperHessenberg s -- fixme
-    where (u,s) = schur m
-
----------------------------------------------------------------------
-
-nd1 = (3><3) [ 1/2, 1/4, 1/4
-             , 0/1, 1/2, 1/4
-             , 1/2, 1/4, 1/2 :: Double]
-
-nd2 = (2><2) [1, 0, 1, 1:: Complex Double]
-
-expmTest1 = expm nd1 :~14~: (3><3)
- [ 1.762110887278176
- , 0.478085470590435
- , 0.478085470590435
- , 0.104719410945666
- , 1.709751181805343
- , 0.425725765117601
- , 0.851451530235203
- , 0.530445176063267
- , 1.814470592751009 ]
-
-expmTest2 = expm nd2 :~15~: (2><2)
- [ 2.718281828459045
- , 0.000000000000000
- , 2.718281828459045
- , 2.718281828459045 ]
-
-expmTestDiag m = expm (logm m) |~| complex m
-    where logm m = matFunc Prelude.log m
-
-
-
----------------------------------------------------------------------
-
-asFortran m = (rows m >|< cols m) $ toList (flatten $ trans  m)
-asC m = (rows m >< cols m) $ toList (flatten m)
-
-mulC a b = a <> b
-mulF a b = trans $ trans b <> trans a
-
--------------------------------------------------------------------------
-
-multiplyG a b = reshape (cols b) $ fromList $ concat $ multiplyL (toLists a) (toLists b)
-    where multiplyL a b = [[dotL x y | y <- transpose b] | x <- a]
-          dotL a b = sum (zipWith (*) a b)
-
-r >|< c = f where
-    f l | dim v == r*c = reshapeF r v
-        | otherwise    = error "(>|<)"
-        where v = fromList l
-    reshapeF r = trans . reshape r
-
----------------------------------------------------------------------
-
-rot :: Double -> Matrix Double
-rot a = (3><3) [ c,0,s
-               , 0,1,0
-               ,-s,0,c ]
-    where c = cos a
-          s = sin a
-
-fun n = foldl1' (<>) (map rot angles)
-    where angles = toList $ linspace n (0,1)
-
-rotTest = fun (10^5) :~12~: rot 5E4
-
----------------------------------------------------------------------
-
-tests = do
-    setErrorHandlerOff
-    putStrLn "--------- internal -----"
-    quickCheck ((\m -> m == trans m).sym :: Sym Double -> Bool)
-    quickCheck ((\m -> m == trans m).sym :: Sym (Complex Double) -> Bool)
-    quickCheck $ \l -> null l || (toList . fromList) l == (l :: [Double])
-    quickCheck $ \l -> null l || (toList . fromList) l == (l :: [Complex Double])
-    quickCheck $ \m -> m == asC (m :: RM)
-    quickCheck $ \m -> m == asC (m :: CM)
-    quickCheck $ \m -> m == asFortran (m :: RM)
-    quickCheck $ \m -> m == asFortran (m :: CM)
-    quickCheck $ \m -> m == (asC . asFortran) (m :: RM)
-    quickCheck $ \m -> m == (asC . asFortran) (m :: CM)
-    runTestTT $ TestList
-     [ test "1E5 rots" rotTest
-     ]
-    putStrLn "--------- multiply ----"
-    quickCheck $ \(PairM m1 m2) -> mulC m1 m2 == mulF m1 (m2 :: RM)
-    quickCheck $ \(PairM m1 m2) -> mulC m1 m2 == mulF m1 (m2 :: CM)
-    quickCheck $ \(PairM m1 m2) -> mulC m1 m2 == trans (mulF (trans m2) (trans m1 :: RM))
-    quickCheck $ \(PairM m1 m2) -> mulC m1 m2 == trans (mulF (trans m2) (trans m1 :: CM))
-    quickCheck $ \(PairM m1 m2) -> mulC m1 m2 == multiplyG m1 (m2 :: RM)
-    quickCheck $ \(PairM m1 m2) -> mulC m1 m2 == multiplyG m1 (m2 :: CM)
-    putStrLn "--------- lu ---------"
-    quickCheck (luTest1 :: RM->Bool)
-    quickCheck (luTest1 :: CM->Bool)
-    quickCheck (detTest2 . sqm  :: SqM Double -> Bool)
-    quickCheck (detTest2 . sqm  :: SqM (Complex Double) -> Bool)
-    runTestTT $ TestList
-     [ test "det1" detTest1
-     ]
-    putStrLn "--------- svd ---------"
-    quickCheck (svdTest svdR)
-    quickCheck (svdTest svdRdd)
-    quickCheck (svdTest svdC)
-    quickCheck (svdTest' svdR)
-    quickCheck (svdTest' svdRdd)
-    quickCheck (svdTest' svdC)
-    quickCheck (svdTest' GSL.svdg)
-    putStrLn "--------- eig ---------"
-    quickCheck (eigTest  . sqm :: SqM Double -> Bool)
-    quickCheck (eigTest  . sqm :: SqM (Complex Double) -> Bool)
-    quickCheck (eigTestSH . sym :: Sym Double -> Bool)
-    quickCheck (eigTestSH . her :: Her -> Bool)
-    putStrLn "--------- inv ------"
-    quickCheck (invTest . sqm   :: SqM Double -> Bool)
-    quickCheck (invTest . sqm   :: SqM (Complex Double) -> Bool)
-    putStrLn "--------- pinv ------"
-    quickCheck (pinvTest ::RM->Bool)
-    if os == "mingw32"
-        then putStrLn "complex pinvTest skipped in this OS"
-        else quickCheck (pinvTest ::CM->Bool)
-    putStrLn "--------- chol ------"
-    runTestTT $ TestList
-     [ test "cholR" cholRTest
-     , test "cholC" cholCTest
-     ]
-    putStrLn "--------- qr ---------"
-    quickCheck (qrTest GSL.qr)
-    quickCheck (qrTest (GSL.unpackQR . GSL.qrPacked))
-    quickCheck (qrTest (    unpackQR . GSL.qrPacked))
-    quickCheck (qrTest qr ::RM->Bool)
-    quickCheck (qrTest qr ::CM->Bool)
-    putStrLn "--------- hess --------"
-    quickCheck (hessTest . sqm ::SqM Double->Bool)
-    quickCheck (hessTest . sqm ::SqM (Complex Double) -> Bool)
-    putStrLn "--------- schur --------"
-    quickCheck (schurTest2 . sqm ::SqM Double->Bool)
-    if os == "mingw32"
-        then putStrLn "complex schur skipped in this OS"
-        else quickCheck (schurTest1 . sqm ::SqM (Complex Double) -> Bool)
-    putStrLn "--------- expm --------"
-    runTestTT $ TestList
-     [ test "expmd" (expmTestDiag $ (2><2) [1,2,3,5 :: Double])
-     , test "expm1" (expmTest1)
-     , test "expm2" (expmTest2)
-     ]
-    putStrLn "--------- nullspace ------"
-    quickCheck (nullspaceTest :: RM -> Bool)
-    quickCheck (nullspaceTest :: CM -> Bool)
-    putStrLn "--------- vector operations ------"
-    quickCheck $ (\u -> sin u ^ 2 + cos u ^ 2 |~| (1::RM))
-    quickCheck $ (\u -> sin u ** 2 + cos u ** 2 |~| (1::RM))
-    quickCheck $ (\u -> cos u * tan u |~| sin (u::RM))
-    quickCheck $ (\u -> (cos u * tan u) :~6~: sin (u::CM))
-    runTestTT $ TestList
-     [ test "arith1" $ ((ones (100,100) * 5 + 2)/0.5 - 7)**2 |~| (49 :: RM)
-     , test "arith2" $ (((1+i) .* ones (100,100) * 5 + 2)/0.5 - 7)**2 |~| ( (140*i-51).*1 :: CM)
-     , test "arith3" $ exp (i.*ones(10,10)*pi) + 1 |~| 0
-     , test "<\\>"   $ (3><2) [2,0,0,3,1,1::Double] <\> 3|>[4,9,5] |~| 2|>[2,3]
-     ]
-    putStrLn "--------- GSL ------"
-    quickCheck $ \v -> ifft (fft v) |~| v
-    runTestTT $ TestList
-     [ gammaTest
-     , besselTest
-     , exponentialTest
-     , integrateTest
-     , polySolveTest
-     ]
-
 bigtests = do
     putStrLn "--------- big matrices -----"
     runTestTT $ TestList
-     [ test "eigS" $ eigTestSH bigmat
-     , test "eigH" $ eigTestSH bigmatc
-     , test "eigR" $ eigTest   bigmat
-     , test "eigC" $ eigTest   bigmatc
-     , test "det"  $ det (feye 1000) == 1 && det (feye 1002) == -1
+     [ utest "eigS" $ eigSHProp bigmat
+     , utest "eigH" $ eigSHProp bigmatc
+     , utest "eigR" $ eigProp   bigmat
+     , utest "eigC" $ eigProp   bigmatc
+     , utest "det"  $ det (feye 1000) == 1 && det (feye 1002) == -1
      ]
+    return ()
 
 main = do
     args <- getArgs
     if "--big" `elem` args
         then bigtests
-        else tests
+        else runTests 20
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs
index 7ecf812..96280fb 100644
--- a/lib/Numeric/LinearAlgebra/Tests.hs
+++ b/lib/Numeric/LinearAlgebra/Tests.hs
@@ -23,42 +23,174 @@ import Numeric.LinearAlgebra
 import Numeric.LinearAlgebra.Tests.Instances
 import Numeric.LinearAlgebra.Tests.Properties
 import Test.QuickCheck
-import Numeric.GSL(setErrorHandlerOff)
+import Test.HUnit hiding ((~:),test)
+import System.Info
+import Data.List(foldl1')
+import Numeric.GSL hiding (sin,cos,exp,choose)
 
 qCheck n = check defaultConfig {configSize = const n}
 
+utest str b = TestCase $ assertBool str b
+
+feye n = flipud (ident n) :: Matrix Double
+
+detTest1 = det m == 26
+        && det mc == 38 :+ (-3)
+        && det (feye 2) == -1
+    where
+        m = (3><3) 
+            [ 1, 2, 3
+            , 4, 5, 7
+            , 2, 8, 4 :: Double
+            ]
+        mc = (3><3)
+            [ 1, 2, 3
+            , 4, 5, 7
+            , 2, 8, i
+            ]
+
+--------------------------------------------------------------------
+
+polyEval cs x = foldr (\c ac->ac*x+c) 0 cs
+
+polySolveProp p = length p <2 || last p == 0|| 1E-8 > maximum (map magnitude $ map (polyEval (map (:+0) p)) (polySolve p))
+
+---------------------------------------------------------------------
+
+quad f a b = fst $ integrateQAGS 1E-9 100 f a b
+
+-- A multiple integral can be easily defined using partial application
+quad2 f a b g1 g2 = quad h a b
+    where h x = quad (f x) (g1 x) (g2 x)
+
+volSphere r = 8 * quad2 (\x y -> sqrt (r*r-x*x-y*y)) 
+                        0 r (const 0) (\x->sqrt (r*r-x*x))
+
+---------------------------------------------------------------------
+
+besselTest = utest "bessel_J0_e" ( abs (r-expected) < e )
+    where (r,e) = bessel_J0_e 5.0
+          expected = -0.17759677131433830434739701
+
+exponentialTest = utest "exp_e10_e" ( abs (v*10^e - expected) < 4E-2 )
+    where (v,e,err) = exp_e10_e 30.0
+          expected = exp 30.0
+
+---------------------------------------------------------------------
+
+nd1 = (3><3) [ 1/2, 1/4, 1/4
+             , 0/1, 1/2, 1/4
+             , 1/2, 1/4, 1/2 :: Double]
+
+nd2 = (2><2) [1, 0, 1, 1:: Complex Double]
+
+expmTest1 = expm nd1 :~14~: (3><3)
+ [ 1.762110887278176
+ , 0.478085470590435
+ , 0.478085470590435
+ , 0.104719410945666
+ , 1.709751181805343
+ , 0.425725765117601
+ , 0.851451530235203
+ , 0.530445176063267
+ , 1.814470592751009 ]
+
+expmTest2 = expm nd2 :~15~: (2><2)
+ [ 2.718281828459045
+ , 0.000000000000000
+ , 2.718281828459045
+ , 2.718281828459045 ]
+
+
+---------------------------------------------------------------------
+
+rot :: Double -> Matrix Double
+rot a = (3><3) [ c,0,s
+               , 0,1,0
+               ,-s,0,c ]
+    where c = cos a
+          s = sin a
+
+rotTest = fun (10^5) :~12~: rot 5E4
+    where fun n = foldl1' (<>) (map rot angles)
+              where angles = toList $ linspace n (0,1)
+
+
 -- | It runs all the tests.
 runTests :: Int  -- ^ maximum dimension
          -> IO ()
 runTests n = do
     setErrorHandlerOff
     let test p = qCheck n p
+    putStrLn "------ lu"
     test (luProp    . rM)
     test (luProp    . cM)
+    putStrLn "------ inv"
     test (invProp   . rSqWC)
     test (invProp   . cSqWC)
+    putStrLn "------ pinv"
     test (pinvProp  . rM)
-    test (pinvProp  . cM)
+    if os == "mingw32"
+        then putStrLn "complex pinvTest skipped in this OS"
+        else test (pinvProp  . cM)
+    putStrLn "------ det"
+    test (detProp   . rSqWC)
     test (detProp   . cSqWC)
+    putStrLn "------ svd"
     test (svdProp1  . rM)
     test (svdProp1  . cM)
     test (svdProp2  . rM)
     test (svdProp2  . cM)
+    putStrLn "------ eig"
     test (eigSHProp . rHer)
     test (eigSHProp . cHer)
     test (eigProp   . rSq)
     test (eigProp   . cSq)
+    putStrLn "------ nullSpace"
     test (nullspaceProp . rM)
     test (nullspaceProp . cM)
+    putStrLn "------ qr"
     test (qrProp     . rM)
     test (qrProp     . cM)
+    putStrLn "------ hess"
     test (hessProp   . rSq)
     test (hessProp   . cSq)
+    putStrLn "------ schur"
     test (schurProp2 . rSq)
-    test (schurProp1 . cSq)
+    if os == "mingw32"
+        then putStrLn "complex schur skipped in this OS"
+        else test (schurProp1 . cSq)
+    putStrLn "------ chol"
     test (cholProp   . rPosDef)
     test (cholProp   . cPosDef)
+    putStrLn "------ expm"
+    test (expmDiagProp . rSqWC)
+    test (expmDiagProp . cSqWC)
+    putStrLn "------ fft"
+    test (\v -> ifft (fft v) |~| v)
+    putStrLn "------ vector operations"
+    test (\u -> sin u ^ 2 + cos u ^ 2 |~| (1::RM))
+    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))
+    putStrLn "------ some unit tests"
+    runTestTT $ TestList
+        [ utest "1E5 rots" rotTest
+        , utest "det1" detTest1
+        , utest "expm1" (expmTest1)
+        , utest "expm2" (expmTest2)
+        , utest "arith1" $ ((ones (100,100) * 5 + 2)/0.5 - 7)**2 |~| (49 :: RM)
+        , utest "arith2" $ (((1+i) .* ones (100,100) * 5 + 2)/0.5 - 7)**2 |~| ( (140*i-51).*1 :: CM)
+        , utest "arith3" $ exp (i.*ones(10,10)*pi) + 1 |~| 0
+        , utest "<\\>"   $ (3><2) [2,0,0,3,1,1::Double] <\> 3|>[4,9,5] |~| 2|>[2,3]
+        , utest "gamma" (gamma 5 == 24.0)
+        , besselTest
+        , exponentialTest
+        , utest "integrate" (abs (volSphere 2.5 - 4/3*pi*2.5^3) < 1E-8)
+        , utest "polySolve" (polySolveProp [1,2,3,4])
+        ]
+    return ()
 
--- | Some additional tests on big matrices. They take a few minutes.
-runBigTests :: IO ()
-runBigTests = undefined
+-- -- | Some additional tests on big matrices. They take a few minutes.
+-- runBigTests :: IO ()
+-- runBigTests = undefined
diff --git a/lib/Numeric/LinearAlgebra/Tests/Properties.hs b/lib/Numeric/LinearAlgebra/Tests/Properties.hs
index 0317469..0563e62 100644
--- a/lib/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/lib/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -9,13 +9,33 @@ Maintainer  :  Alberto Ruiz (aruiz at um dot es)
 Stability   :  provisional
 Portability :  portable
 
-Arbitrary instances for vectors, matrices.
+Testing properties.
 
 -}
 
-module Numeric.LinearAlgebra.Tests.Properties
-
-where
+module Numeric.LinearAlgebra.Tests.Properties (
+    dist, (|~|), (~:), Aprox((:~)),
+    zeros, ones,
+    square,
+    unitary,
+    hermitian,
+    wellCond,
+    positiveDefinite,
+    upperTriang,
+    upperHessenberg,
+    luProp,
+    invProp,
+    pinvProp,
+    detProp,
+    nullspaceProp,
+    svdProp1, svdProp2,
+    eigProp, eigSHProp,
+    qrProp,
+    hessProp,
+    schurProp1, schurProp2,
+    cholProp,
+    expmDiagProp
+) where
 
 import Numeric.LinearAlgebra
 import Numeric.LinearAlgebra.Tests.Instances(Sq(..),Her(..),Rot(..))
@@ -50,8 +70,6 @@ unitary m = square m && m <> ctrans m |~| ident (rows m)
 
 hermitian m = square m && m |~| ctrans m
 
-degenerate m = rank m < min (rows m) (cols m)
-
 wellCond m = rcond m > 1/100
 
 positiveDefinite m = minimum (toList e) > 0
@@ -125,3 +143,7 @@ schurProp2 m = m |~| u <> s <> ctrans u && unitary u && upperHessenberg s -- fix
 cholProp m = m |~| ctrans c <> c && upperTriang c
     where c = chol m
           pos = positiveDefinite m
+
+expmDiagProp m = expm (logm m) |~| complex m
+    where logm m = matFunc log m
+