4 files changed, 13 insertions, 13 deletions

diff --git a/examples/minimize.hs b/examples/minimize.hs
index d7bc350..5beba3b 100644
--- a/examples/minimize.hs
+++ b/examples/minimize.hs
@@ -2,6 +2,7 @@
 import Numeric.GSL
 import Numeric.LinearAlgebra
 import Graphics.Plot
+import Text.Printf(printf)
 
 -- the function to be minimized 
 f [x,y] = 10*(x-1)^2 + 20*(y-2)^2 + 30
@@ -26,18 +27,20 @@ main = do
     -- conjugate gradient with true gradient
     let (s,p) = minimizeCG f df [5,7]
     print s -- solution
-    dispR 2 p -- evolution of the algorithm
+    disp p -- evolution of the algorithm
     let [x,y] = drop 2 (toColumns p)
     mplot [x,y]  -- path from the starting point to the solution
 
     -- conjugate gradient with estimated gradient
     let (s,p) = minimizeCG f (gradient f) [5,7]
     print s
-    dispR 2 p
+    disp p
     mplot $ drop 2 (toColumns p)
 
     -- without gradient, using the NM Simplex method
     let (s,p) = minimizeS f [5,7]
     print s
-    dispR 2 p
+    disp p
     mplot $ drop 3 (toColumns p)
+
+disp = putStrLn . format "  " (printf "%.2f")
\ No newline at end of file
diff --git a/examples/tests.hs b/examples/tests.hs
index 974ec24..b44d140 100644
--- a/examples/tests.hs
+++ b/examples/tests.hs
@@ -83,7 +83,7 @@ her (Her a) = a
 instance {-(Field a, Arbitrary a, Num a) =>-} Arbitrary Her where
     arbitrary = do
         SqM m <- arbitrary
-        return $ Her (m + conjTrans m)
+        return $ Her (m + ctrans m)
     coarbitrary = undefined
 
 data PairSM a = PairSM (Matrix a) (Matrix a) deriving Show
@@ -125,7 +125,7 @@ pseudorandomC seed (n,m) = toComplex (pseudorandomR seed (n,m), pseudorandomR (s
 
 bigmat = m + trans m :: RM
     where m = pseudorandomR 18 (1000,1000)
-bigmatc = mc + conjTrans mc ::CM
+bigmatc = mc + ctrans mc ::CM
     where mc = pseudorandomC 19 (1000,1000)
 
 ----------------------------------------------------------------------
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 260c1e0..e94d038 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -16,10 +16,11 @@
 module Data.Packed.Matrix (
     Field,
     Matrix,rows,cols,
-    (><), reshape, flatten,
+    (><),
+    trans,
+    reshape, flatten,
     fromLists, toLists,
     (@@>),
-    trans, conjTrans,
     asRow, asColumn,
     fromRows, toRows, fromColumns, toColumns,
     fromBlocks, repmat,
@@ -28,7 +29,7 @@ module Data.Packed.Matrix (
     extractRows,
     ident, diag, diagRect, takeDiag,
     liftMatrix, liftMatrix2,
-    format, dispR, readMatrix, fromFile, fromArray2D
+    format, readMatrix, fromFile, fromArray2D
 ) where
 
 import Data.Packed.Internal
@@ -154,10 +155,6 @@ flatten = cdat
 fromLists :: Field t => [[t]] -> Matrix t
 fromLists = fromRows . map fromList
 
--- | conjugate transpose
-conjTrans :: Matrix (Complex Double) -> Matrix (Complex Double)
-conjTrans = trans . liftMatrix conj
-
 -- | creates a 1-row matrix from a vector
 asRow :: Field a => Vector a -> Matrix a
 asRow v = reshape (dim v) v
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 425532d..84c399a 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -91,7 +91,7 @@ instance GenMat (Complex Double) where
     lu  = GSL.luC
     linearSolve = linearSolveC
     linearSolveSVD = linearSolveSVDC Nothing
-    ctrans = conjTrans
+    ctrans = conj . trans
     eig = eigC
     eigSH' = eigH
     cholSH = cholH