ctrans moved to Data.Packed.Matrix

3 files changed, 10 insertions, 7 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index e66817e..5892f1c 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -255,22 +255,27 @@ class (Storable a, Floating a) => Element a where
     transdata = transdata'
     constantD  :: a -> Int -> Vector a
     constantD = constant'
+    ctrans' :: Matrix a -> Matrix a
 
 instance Element Float where
     transdata  = transdataAux ctransF
     constantD  = constantAux cconstantF
+    ctrans'    = trans
 
 instance Element Double where
     transdata  = transdataAux ctransR
     constantD  = constantAux cconstantR
+    ctrans'    = trans
 
 instance Element (Complex Float) where
     transdata  = transdataAux ctransQ
     constantD  = constantAux cconstantQ
+    ctrans'    = liftMatrix (mapVector conjugate) . trans
 
 instance Element (Complex Double) where
     transdata  = transdataAux ctransC
     constantD  = constantAux cconstantC
+    ctrans'    = liftMatrix (mapVector conjugate) . trans
 
 -------------------------------------------------------------------
 
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 03e5889..af937f4 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -22,7 +22,7 @@ module Data.Packed.Matrix (
     Element,
     Matrix,rows,cols,
     (><),
-    trans,
+    trans, ctrans,
     reshape, flatten,
     fromLists, toLists, buildMatrix,
     (@@>),
@@ -268,6 +268,10 @@ asRow v = reshape (dim v) v
 asColumn :: Element a => Vector a -> Matrix a
 asColumn v = reshape 1 v
 
+-- | conjugate transpose
+ctrans :: Element e => Matrix e -> Matrix e
+ctrans = ctrans'
+
 
 {- | creates a Matrix of the specified size using the supplied function to
      to map the row/column position to the value at that row/column position.
diff --git a/lib/Numeric/Container.hs b/lib/Numeric/Container.hs
index 0a07adc..77c9902 100644
--- a/lib/Numeric/Container.hs
+++ b/lib/Numeric/Container.hs
@@ -213,8 +213,6 @@ instance (Container Vector a) => Container Matrix a where
 class Element e => Product e where
     -- | matrix product
     multiply :: Matrix e -> Matrix e -> Matrix e
-    -- | conjugate transpose
-    ctrans :: Matrix e -> Matrix e
     -- | dot (inner) product
     dot        :: Vector e -> Vector e -> e
     -- | sum of absolute value of elements (differs in complex case from @norm1@
@@ -233,7 +231,6 @@ instance Product Float where
     norm1      = toScalarF AbsSum
     normInf    = maxElement . vectorMapF Abs
     multiply = multiplyF
-    ctrans = trans
 
 instance Product Double where
     norm2      = toScalarR Norm2
@@ -242,7 +239,6 @@ instance Product Double where
     norm1      = toScalarR AbsSum
     normInf    = maxElement . vectorMapR Abs
     multiply = multiplyR
-    ctrans = trans
 
 instance Product (Complex Float) where
     norm2      = toScalarQ Norm2
@@ -251,7 +247,6 @@ instance Product (Complex Float) where
     norm1      = sumElements . fst . fromComplex . vectorMapQ Abs
     normInf    = maxElement . fst . fromComplex . vectorMapQ Abs
     multiply = multiplyQ
-    ctrans = conj . trans
 
 instance Product (Complex Double) where
     norm2      = toScalarC Norm2
@@ -260,7 +255,6 @@ instance Product (Complex Double) where
     norm1      = sumElements . fst . fromComplex . vectorMapC Abs
     normInf    = maxElement . fst . fromComplex . vectorMapC Abs
     multiply = multiplyC
-    ctrans = conj . trans
 
 ----------------------------------------------------------