more refactoring

2 files changed, 19 insertions, 18 deletions

diff --git a/examples/oldtests.hs b/examples/oldtests.hs
index b01675f..f60f4e2 100644
--- a/examples/oldtests.hs
+++ b/examples/oldtests.hs
@@ -5,14 +5,14 @@ import System.Random(randomRs,mkStdGen)
 realMatrix = fromLists :: [[Double]] -> Matrix Double
 realVector = fromList ::  [Double] -> Vector Double
 
-toComplexM = uncurry $ liftMatrix2 (curry toComplex)
+
 
 infixl 2 =~=
 a =~= b = pnorm 1 (flatten (a - b)) < 1E-6
 
 randomMatrix seed (n,m) = reshape m $ realVector $ take (n*m) $ randomRs (-100,100) $ mkStdGen seed 
 
-randomMatrixC seed (n,m) = toComplexM (randomMatrix seed (n,m), randomMatrix (seed+1) (n,m))
+randomMatrixC seed (n,m) = toComplex (randomMatrix seed (n,m), randomMatrix (seed+1) (n,m))
 
 besselTest = do
     let (r,e) = bessel_J0_e 5.0
@@ -31,7 +31,7 @@ ms = realMatrix [[1,2,3]
 
 ms' = randomMatrix 27 (50,100)
 
-ms'' = toComplexM (randomMatrix 100 (50,100),randomMatrix 101 (50,100))
+ms'' = toComplex (randomMatrix 100 (50,100),randomMatrix 101 (50,100))
 
 fullsvdTest method mat msg = do
     let (u,s,vt) = method mat
@@ -43,7 +43,7 @@ full_svd_Rd = svdRdd
 
 --------------------------------------------------------------------
 
-mcu = toComplexM (randomMatrix 33 (20,20),randomMatrix 34 (20,20))
+mcu = toComplex (randomMatrix 33 (20,20),randomMatrix 34 (20,20))
 
 mcur = randomMatrix 35 (40,40)
 
@@ -53,7 +53,7 @@ eigTest method m msg = do
     assertBool msg $ m <> v =~= v <> diag s
 
 bigmat = m + trans m where m = randomMatrix 18 (1000,1000)
-bigmatc = mc + conjTrans mc where mc = toComplexM(m,m)
+bigmatc = mc + conjTrans mc where mc = toComplex(m,m)
                                   m = randomMatrix 19 (1000,1000)
 
 --------------------------------------------------------------------
@@ -62,22 +62,22 @@ invTest msg m = do
     assertBool msg $ m <> inv m =~= ident (rows m)
 
 invComplexTest msg m = do
-    assertBool msg $ m <> invC m =~= ident (rows m)
+    assertBool msg $ m <> invC m =~= identC (rows m)
 
-invC m = linearSolveC m (ident (rows m))
+invC m = linearSolveC m (identC (rows m))
 
---identC n = toComplexM(ident n, (0::Double) <>ident n)
+identC = comp . ident
 
 --------------------------------------------------------------------
 
 pinvTest f msg m = do
     assertBool msg $ m <> f m <> m =~= m
 
-pinvC m = linearSolveLSC m (ident (rows m))
+pinvC m = linearSolveLSC m (identC (rows m))
 
 pinvSVDR m = linearSolveSVDR Nothing m (ident (rows m))
 
-pinvSVDC m = linearSolveSVDC Nothing m (ident (rows m))
+pinvSVDC m = linearSolveSVDC Nothing m (identC (rows m))
 
 --------------------------------------------------------------------
 
diff --git a/examples/tests.hs b/examples/tests.hs
index 0a09ced..2f3b3d8 100644
--- a/examples/tests.hs
+++ b/examples/tests.hs
@@ -6,10 +6,9 @@
 
 -----------------------------------------------------------------------------
 
-import Data.Packed.Internal
+import Data.Packed.Internal((>|<), fdat, cdat, multiply', multiplyG, MatrixOrder(..))
 import Data.Packed.Vector
 import Data.Packed.Matrix
-import Data.Packed.Internal.Matrix
 import GSL.Vector
 import GSL.Integration
 import GSL.Differentiation
@@ -95,6 +94,8 @@ asC m = (rows m >< cols m) $ toList (cdat m)
 mulC a b = multiply' RowMajor a b
 mulF a b = multiply' ColumnMajor a b
 
+identC = comp . ident
+
 infixl 7 <>
 a <> b = mulF a b
 
@@ -198,15 +199,15 @@ svdTestR fun m = u <> s <> trans v |~| m
 
 
 svdTestC m = u <> s' <> (trans v) |~| m
-                  && u <> conjTrans u |~| ident (rows m)
-                  && v <> conjTrans v |~| ident (cols m)
+                  && u <> conjTrans u |~| identC (rows m)
+                  && v <> conjTrans v |~| identC (cols m)
     where (u,s,v) = svdC m
           s' = liftMatrix comp s
 
 --svdg' m = (u,s',v) where 
 
 eigTestC (SqM m) = (m <> v) |~| (v <> diag s)
-                        && takeDiag (conjTrans v <> v) |~| constant 1 (rows m) --normalized
+                        && takeDiag (conjTrans v <> v) |~| comp (constant 1 (rows m)) --normalized
     where (s,v) = eigC m
 
 eigTestR (SqM m) = (liftMatrix comp m <> v) |~| (v <> diag s)
@@ -218,7 +219,7 @@ eigTestS (Sym m) = (m <> v) |~| (v <> diag s)
     where (s,v) = eigS m
 
 eigTestH (Her m) = (m <> v) |~| (v <> diag (comp s))
-                        && v <> conjTrans v |~| ident (cols m)
+                        && v <> conjTrans v |~| identC (cols m)
     where (s,v) = eigH m
 
 linearSolveSQTest fun singu (PairSM a b) = singu a || (a <> fun a b) |~| b
@@ -248,11 +249,11 @@ identC n = toComplex(ident n, (0::Double) <>ident n)
 pinvTest f m = (m <> f m <> m) |~| m
 
 pinvR m = linearSolveLSR m (ident (rows m))
-pinvC m = linearSolveLSC m (ident (rows m))
+pinvC m = linearSolveLSC m (identC (rows m))
 
 pinvSVDR m = linearSolveSVDR Nothing m (ident (rows m))
 
-pinvSVDC m = linearSolveSVDC Nothing m (ident (rows m))
+pinvSVDC m = linearSolveSVDC Nothing m (identC (rows m))
 
 --------------------------------------------------------------------