diff options
author | Alberto Ruiz <aruiz@um.es> | 2007-11-12 10:01:39 +0000 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2007-11-12 10:01:39 +0000 |
commit | c41d21fefa04c66039a0b218daaa53c2577ef838 (patch) | |
tree | 3dd182457a89edbf52688fb43fdc8b2a130829e8 /examples | |
parent | 9e6500bf8e925b363e74e01834f81dde0810f808 (diff) |
data structures simplification
Diffstat (limited to 'examples')
-rw-r--r-- | examples/tests.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/tests.hs b/examples/tests.hs index 2fbf9e2..c15a750 100644 --- a/examples/tests.hs +++ b/examples/tests.hs | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | module Main where | 3 | module Main where |
4 | 4 | ||
5 | import Data.Packed.Internal((>|<), fdat, cdat, multiply', multiplyG, MatrixOrder(..),debug) | 5 | import Data.Packed.Internal((>|<), multiply', multiplyG, MatrixOrder(..),debug,fmat) |
6 | import Numeric.GSL hiding (sin,cos,exp,choose) | 6 | import Numeric.GSL hiding (sin,cos,exp,choose) |
7 | import Numeric.LinearAlgebra | 7 | import Numeric.LinearAlgebra |
8 | import Numeric.LinearAlgebra.Linear(Linear) | 8 | import Numeric.LinearAlgebra.Linear(Linear) |
@@ -329,8 +329,8 @@ expmTestDiag m = expm (logm m) |~| complex m | |||
329 | 329 | ||
330 | --------------------------------------------------------------------- | 330 | --------------------------------------------------------------------- |
331 | 331 | ||
332 | asFortran m = (rows m >|< cols m) $ toList (fdat m) | 332 | asFortran m = (rows m >|< cols m) $ toList (flatten $ trans m) |
333 | asC m = (rows m >< cols m) $ toList (cdat m) | 333 | asC m = (rows m >< cols m) $ toList (flatten m) |
334 | 334 | ||
335 | mulC a b = multiply' RowMajor a b | 335 | mulC a b = multiply' RowMajor a b |
336 | mulF a b = multiply' ColumnMajor a b | 336 | mulF a b = multiply' ColumnMajor a b |
@@ -383,8 +383,8 @@ tests = do | |||
383 | quickCheck (svdTest' svdC) | 383 | quickCheck (svdTest' svdC) |
384 | quickCheck (svdTest' svdg) | 384 | quickCheck (svdTest' svdg) |
385 | putStrLn "--------- eig ---------" | 385 | putStrLn "--------- eig ---------" |
386 | quickCheck (eigTest . sqm :: SqM Double -> Bool) | 386 | quickCheck (eigTest . sqm :: SqM Double -> Bool) |
387 | quickCheck (eigTest . sqm :: SqM (Complex Double) -> Bool) | 387 | quickCheck (eigTest . sqm :: SqM (Complex Double) -> Bool) |
388 | quickCheck (eigTestSH . sym :: Sym Double -> Bool) | 388 | quickCheck (eigTestSH . sym :: Sym Double -> Bool) |
389 | quickCheck (eigTestSH . her :: Her -> Bool) | 389 | quickCheck (eigTestSH . her :: Her -> Bool) |
390 | putStrLn "--------- inv ------" | 390 | putStrLn "--------- inv ------" |