6 files changed, 13 insertions, 20 deletions

diff --git a/hmatrix.cabal b/hmatrix.cabal
index e038eb2..9934b6e 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -115,6 +115,7 @@ library
                         Data.Packed.Internal.Matrix,
                         Numeric.GSL.Internal,
                         Numeric.Conversion
+                        Numeric.MatrixBoot
                         Numeric.Chain
 
     C-sources:          lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c,
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 94b56cf..f3bab76 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -246,6 +246,8 @@ compat m1 m2 = rows m1 == rows m2 && cols m1 == cols m2
 ------------------------------------------------------------------
 
 -- | Supported element types for basic matrix operations.
+--     provides unoptimised defaults for all (Storable a) instances
+--     @instance Element Foo where@
 class (Storable a) => Element a where
     subMatrixD :: (Int,Int) -- ^ (r0,c0) starting position 
                -> (Int,Int) -- ^ (rt,ct) dimensions of submatrix
@@ -329,7 +331,7 @@ transdataP c1 d c2 =
           v <- createVector (dim d)
           unsafeWith d $ \pd ->
               unsafeWith v $ \pv ->
-                  ctransP (fi r1) (fi c1) (castPtr pd) (fi sz) (fi r2) (fi c2) (castPtr pv) (fi sz) // check "transdataStorable"
+                  ctransP (fi r1) (fi c1) (castPtr pd) (fi sz) (fi r2) (fi c2) (castPtr pv) (fi sz) // check "transdataP"
           return v
    where r1 = dim d `div` c1
          r2 = dim d `div` c2
diff --git a/lib/Numeric/Container.hs b/lib/Numeric/Container.hs
index 1afc5a1..09f8002 100644
--- a/lib/Numeric/Container.hs
+++ b/lib/Numeric/Container.hs
@@ -22,7 +22,6 @@
 module Numeric.Container (
     -- * Generic operations
     Container(..),
-    ctrans, diag, ident,
     -- * Matrix product and related functions
     Product(..),
     mXm,mXv,vXm,
@@ -222,21 +221,6 @@ instance (Container Vector a) => Container Matrix a where
 
 ----------------------------------------------------
 
--- | conjugate transpose
-ctrans :: Element e => Matrix e -> Matrix e
-ctrans = liftMatrix conjugateD . trans
-
--- | Creates a square matrix with a given diagonal.
-diag :: (Num a, Element a) => Vector a -> Matrix a
-diag v = diagRect 0 v n n where n = dim v
-
--- | creates the identity matrix of given dimension
-ident :: (Num a, Element a) => Int -> Matrix a
-ident n = diag (constantD 1 n)
-
-----------------------------------------------------
-
-
 -- | Matrix product and related functions
 class Element e => Product e where
     -- | matrix product
diff --git a/lib/Numeric/Conversion.hs b/lib/Numeric/Conversion.hs
index fbf608a..8941451 100644
--- a/lib/Numeric/Conversion.hs
+++ b/lib/Numeric/Conversion.hs
@@ -7,15 +7,15 @@
 
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Numeric.Container
--- Copyright   :  (c) Alberto Ruiz 2007
+-- Module      :  Numeric.Conversion
+-- Copyright   :  (c) Alberto Ruiz 2010
 -- License     :  GPL-style
 --
 -- Maintainer  :  Alberto Ruiz <aruiz@um.es>
 -- Stability   :  provisional
 -- Portability :  portable
 --
--- Numeric classes for containers of numbers, including conversion routines
+-- Conversion routines
 --
 -----------------------------------------------------------------------------
 
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 394a1d7..64deba2 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -80,6 +80,7 @@ import Numeric.LinearAlgebra.LAPACK as LAPACK
 import Data.List(foldl1')
 import Data.Array
 import Numeric.Container hiding ((.*),(*/))
+import Numeric.MatrixBoot
 
 -- | Auxiliary typeclass used to define generic computations for both real and complex matrices.
 class (Product t,
diff --git a/lib/Numeric/Matrix.hs b/lib/Numeric/Matrix.hs
index 9260bd5..26d6d6b 100644
--- a/lib/Numeric/Matrix.hs
+++ b/lib/Numeric/Matrix.hs
@@ -28,6 +28,10 @@ module Numeric.Matrix (
     -- * Basic functions
     module Data.Packed.Matrix,
     module Numeric.Vector,
+    -- * Matrix creation
+    diag, ident,
+    -- * matrix operations
+    ctrans, 
     optimiseMult,
     -- * Operators
     (<>), (<\>)
@@ -38,6 +42,7 @@ module Numeric.Matrix (
 import Data.Packed.Matrix
 import Numeric.Vector
 import Numeric.Chain
+import Numeric.MatrixBoot
 import Numeric.LinearAlgebra.Algorithms
 
 -------------------------------------------------------------------