refactoring

2 files changed, 11 insertions, 36 deletions

diff --git a/examples/pru.hs b/examples/pru.hs
index 10789d2..a90aa6f 100644
--- a/examples/pru.hs
+++ b/examples/pru.hs
@@ -1,9 +1,11 @@
 --{-# OPTIONS_GHC  #-}
 --module Main where
 
+import Data.Packed.Internal
 import Data.Packed.Internal.Vector
 import Data.Packed.Internal.Matrix
 import Data.Packed.Internal.Tensor
+import Data.Packed.Matrix
 import LAPACK
 
 import Complex
@@ -11,17 +13,6 @@ import Numeric(showGFloat)
 import Data.List(transpose,intersperse,sort)
 import Foreign.Storable
 
-r >< c = f where
-    f l | dim v == r*c = matrixFromVector RowMajor c v
-        | otherwise    = error $ "inconsistent list size = "
-                                 ++show (dim v) ++"in ("++show r++"><"++show c++")"
-        where v = fromList l
-
-r >|< c = f where
-    f l | dim v == r*c = matrixFromVector ColumnMajor c v
-        | otherwise    = error $ "inconsistent list size = "
-                                 ++show (dim v) ++"in ("++show r++"><"++show c++")"
-        where v = fromList l
 
 vr = fromList [1..15::Double]
 vc = fromList (map (\x->x :+ (x+1)) [1..15::Double])
@@ -49,8 +40,10 @@ cf = mulF af bc
 r = mulC cc (trans cf)
 
 rd = (2><2)
- [  43492.0,  50572.0
- , 102550.0, 119242.0 ]
+ [ 27736.0,  65356.0
+ , 65356.0, 154006.0 ]
+
+
 
 main = do
     print $ r |=| rd
@@ -77,7 +70,6 @@ e i n = fromList [ delta k i | k <- [1..n]]
 
 diagl = diag.fromList
 
-ident n = diag (constant n 1)
 
 tensorFromVector idx v = T {dims = [(dim v,idx)], ten = v}
 tensorFromMatrix idxr idxc m = T {dims = [(rows m,idxr),(cols m,idxc)], ten = cdat m}
@@ -107,10 +99,3 @@ pru = do
     print $ normal t2
     print $ foldl part t2 [("j'",0),("p",1),("r",1)]
 
-
-names t = sort $ map (snd.snd) (dims t)
-
-normal t = tridx (names t) t
-
-contractions t1 t2 = [ contraction t1 n1 t2 n2 | n1 <- names t1, n2 <- names t2, compatIdx t1 n1 t2 n2 ]
-
diff --git a/examples/tests.hs b/examples/tests.hs
index b075704..9f0ae2a 100644
--- a/examples/tests.hs
+++ b/examples/tests.hs
@@ -4,7 +4,9 @@
 
 -----------------------------------------------------------------------------
 
-import Data.Packed.Internal.Vector
+import Data.Packed.Internal
+import Data.Packed.Vector
+import Data.Packed.Matrix
 import Data.Packed.Internal.Matrix
 import LAPACK
 import Test.QuickCheck
@@ -31,18 +33,6 @@ nullspaceProp tol m = cr > 0 ==> m <> nt ~~ zeros
 
 -}
 
-r >< c = f where
-    f l | dim v == r*c = matrixFromVector RowMajor c v
-        | otherwise    = error $ "inconsistent list size = "
-                                 ++show (dim v) ++"in ("++show r++"><"++show c++")"
-        where v = fromList l
-
-r >|< c = f where
-    f l | dim v == r*c = matrixFromVector ColumnMajor c v
-        | otherwise    = error $ "inconsistent list size = "
-                                 ++show (dim v) ++"in ("++show r++"><"++show c++")"
-        where v = fromList l
-
 ac = (2><3) [1 .. 6::Double]
 bc = (3><4) [7 .. 18::Double]
 
@@ -82,8 +72,8 @@ cf = mulF af bc
 r = mulC cc (trans cf)
 
 rd = (2><2)
- [  43492.0,  50572.0
- , 102550.0, 119242.0 :: Double]
+ [ 27736.0,  65356.0
+ , 65356.0, 154006.0 ::Double]
 
 instance (Arbitrary a, RealFloat a) => Arbitrary (Complex a) where
     arbitrary = do