working on contraction

2 files changed, 20 insertions, 8 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 2c57c07..a6f7f0c 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -107,13 +107,17 @@ transdataR = transdataAux ctransR
 transdataC :: Int -> Vector (Complex Double) -> Int -> Vector (Complex Double)
 transdataC = transdataAux ctransC
 
-transdataAux fun c1 d c2 = unsafePerformIO $ do
-    v <- createVector (dim d)
-    let r1 = dim d `div` c1
+transdataAux fun c1 d c2 =
+    if noneed
+        then d
+        else unsafePerformIO $ do
+            v <- createVector (dim d)
+            fun r1 c1 (ptr d) r2 c2 (ptr v) // check "transdataAux" [d]
+            putStrLn "---> transdataAux"
+            return v
+  where r1 = dim d `div` c1
         r2 = dim d `div` c2
-    fun r1 c1 (ptr d) r2 c2 (ptr v) // check "transdataAux" [d]
-    --putStrLn "---> transdataAux"
-    return v
+        noneed = r1 == 1 || c1 == 1
 
 foreign import ccall safe "aux.h transR"
     ctransR :: Double ::> Double ::> IO Int
diff --git a/lib/Data/Packed/Internal/Tensor.hs b/lib/Data/Packed/Internal/Tensor.hs
index 11101a9..960e3c5 100644
--- a/lib/Data/Packed/Internal/Tensor.hs
+++ b/lib/Data/Packed/Internal/Tensor.hs
@@ -17,16 +17,24 @@ module Data.Packed.Internal.Tensor where
 
 import Data.Packed.Internal.Vector
 import Data.Packed.Internal.Matrix
-
+import Foreign.Storable
 
 data IdxTp = Covariant | Contravariant deriving Show
 
 data Tensor t = T { dims   :: [(Int,(IdxTp,String))]
                   , ten    :: Vector t
-                  } deriving Show
+                  }
 
 rank = length . dims
 
 outer u v = dat (multiply RowMajor r c)
     where r = matrixFromVector RowMajor 1 u
           c = matrixFromVector RowMajor (dim v) v
+
+instance (Show a,Storable a) => Show (Tensor a) where
+    show T {dims = [], ten = t} = "scalar "++show (t `at` 0)
+    show T {dims = ds, ten = t} = "("++shdims ds ++") "++ show (toList t)
+
+
+shdims [(n,(t,name))] = name++"["++show n++"]"
+shdims (d:ds) = shdims [d] ++ "><"++ shdims ds
\ No newline at end of file