Merged changes with conversion-linear

3 files changed, 1 insertions, 17 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 100b8ea..e66817e 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -29,7 +29,6 @@ module Data.Packed.Internal.Matrix(
     liftMatrix, liftMatrix2,
     (@@>),
     saveMatrix,
-    fromComplexV, toComplexV, conjV,
     singleton
 ) where
 
@@ -386,21 +385,6 @@ subMatrix' (r0,c0) (rt,ct) m = trans $ subMatrix' (c0,r0) (ct,rt) (trans m)
 
 --------------------------------------------------------------------------
 
--- | obtains the complex conjugate of a complex vector
-conjV :: (Storable a, RealFloat a) => Vector (Complex a) -> Vector (Complex a)
-conjV = mapVector conjugate
-
--- | creates a complex vector from vectors with real and imaginary parts
-toComplexV :: (RealFloat a, Element a) => (Vector a, Vector a) ->  Vector (Complex a)
-toComplexV (r,i) = asComplex $ flatten $ fromColumns [r,i]
-
--- | the inverse of 'toComplex'
-fromComplexV :: (RealFloat a, Element a) => Vector (Complex a) -> (Vector a, Vector a)
-fromComplexV z = (r,i) where
-    [r,i] = toColumns $ reshape 2 $ asReal z
-
---------------------------------------------------------------------------
-
 -- | Saves a matrix as 2D ASCII table.
 saveMatrix :: FilePath
            -> String     -- ^ format (%f, %g, %e)
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index b860cb1..03e5889 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -55,6 +55,7 @@ import Control.Monad(replicateM)
 --import Control.Arrow((***))
 --import GHC.Float(double2Float,float2Double)
 
+
 -------------------------------------------------------------------
 
 instance (Binary a, Element a, Storable a) => Binary (Matrix a) where
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index ad690f9..253f2fa 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -72,7 +72,6 @@ instance (Binary a, Storable a) => Binary (Vector a) where
 
 -------------------------------------------------------------------
 
-
 {-
 vectorFMax :: Vector Float -> Float
 vectorFMax = toScalarF Max