14 files changed, 267 insertions, 330 deletions

diff --git a/packages/base/src/Data/Packed/IO.hs b/packages/base/src/Data/Packed/IO.hs
index 85f1b37..b0999a8 100644
--- a/packages/base/src/Data/Packed/IO.hs
+++ b/packages/base/src/Data/Packed/IO.hs
@@ -22,7 +22,6 @@ import Text.Printf(printf)
 import Data.List(intersperse)
 import Data.Complex
 import Numeric.Vectorized(vectorScan,saveMatrix)
-import Control.Applicative((<$>))
 import Data.Packed.Internal
 
 {- | Creates a string from a matrix given a separator and a function to show each entry. Using
diff --git a/packages/base/src/Data/Packed/Internal/Numeric.hs b/packages/base/src/Data/Packed/Internal/Numeric.hs
index 257ad73..7a4dd29 100644
--- a/packages/base/src/Data/Packed/Internal/Numeric.hs
+++ b/packages/base/src/Data/Packed/Internal/Numeric.hs
@@ -48,7 +48,6 @@ import Numeric.Conversion
 import Data.Packed.Development
 import Numeric.Vectorized
 import Data.Complex
-import Control.Applicative((<*>))
 
 import Numeric.LinearAlgebra.LAPACK(multiplyR,multiplyC,multiplyF,multiplyQ)
 import Data.Packed.Internal
diff --git a/packages/base/src/Data/Packed/Internal/Vector.hs b/packages/base/src/Data/Packed/Internal/Vector.hs
index d0bc143..b49f379 100644
--- a/packages/base/src/Data/Packed/Internal/Vector.hs
+++ b/packages/base/src/Data/Packed/Internal/Vector.hs
@@ -35,7 +35,6 @@ import Foreign.Ptr(Ptr)
 import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf)
 import Foreign.C.Types
 import Data.Complex
-import Control.Monad(when)
 import System.IO.Unsafe(unsafePerformIO)
 
 #if __GLASGOW_HASKELL__ >= 605
diff --git a/packages/base/src/Data/Packed/Numeric.hs b/packages/base/src/Data/Packed/Numeric.hs
index 6027f43..6d62f22 100644
--- a/packages/base/src/Data/Packed/Numeric.hs
+++ b/packages/base/src/Data/Packed/Numeric.hs
@@ -39,7 +39,7 @@ module Data.Packed.Numeric (
     step, cond, find, assoc, accum,
     Transposable(..), Linear(..),
     -- * Matrix product
-    Product(..), udot, dot, (<·>), (#>), app,
+    Product(..), udot, dot, (<·>), (#>), (<#), app,
     Mul(..),
     (<.>),
     optimiseMult,
@@ -71,7 +71,6 @@ import Data.Packed
 import Data.Packed.Internal.Numeric
 import Data.Complex
 import Numeric.LinearAlgebra.Algorithms(Field,linearSolveSVD)
-import Data.Monoid(Monoid(mconcat))
 import Data.Packed.IO
 import Numeric.LinearAlgebra.Random
 
@@ -142,6 +141,11 @@ fromList [140.0,320.0]
 app :: Numeric t => Matrix t -> Vector t -> Vector t
 app = (#>)
 
+infixl 8 <#
+-- | dense vector-matrix product
+(<#) :: Numeric t => Vector t -> Matrix t -> Vector t
+(<#) = vXm
+
 --------------------------------------------------------------------------------
 
 class Mul a b c | a b -> c where
diff --git a/packages/base/src/Numeric/Chain.hs b/packages/base/src/Numeric/Chain.hs
index 443bd28..64c09c0 100644
--- a/packages/base/src/Numeric/Chain.hs
+++ b/packages/base/src/Numeric/Chain.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE FlexibleContexts #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Numeric.Chain
diff --git a/packages/base/src/Numeric/LinearAlgebra.hs b/packages/base/src/Numeric/LinearAlgebra.hs
index ad315e4..4ba0c98 100644
--- a/packages/base/src/Numeric/LinearAlgebra.hs
+++ b/packages/base/src/Numeric/LinearAlgebra.hs
@@ -1,22 +1,235 @@
---------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.LinearAlgebra
-Copyright   :  (c) Alberto Ruiz 2006-14
+Copyright   :  (c) Alberto Ruiz 2006-15
 License     :  BSD3
 Maintainer  :  Alberto Ruiz
 Stability   :  provisional
 
 -}
---------------------------------------------------------------------------------
-{-# OPTIONS_HADDOCK hide #-}
-
+-----------------------------------------------------------------------------
 module Numeric.LinearAlgebra (
-    module Numeric.Container,
-    module Numeric.LinearAlgebra.Algorithms
+
+    -- * Basic types and data processing
+    module Numeric.LinearAlgebra.Data,
+
+    -- * Arithmetic and numeric classes
+    -- |
+    -- The standard numeric classes are defined elementwise:
+    --
+    -- >>>  vector [1,2,3] * vector [3,0,-2]
+    -- fromList [3.0,0.0,-6.0]
+    --
+    -- >>> matrix 3 [1..9] * ident 3
+    -- (3><3)
+    --  [ 1.0, 0.0, 0.0
+    --  , 0.0, 5.0, 0.0
+    --  , 0.0, 0.0, 9.0 ]
+    --
+    -- In arithmetic operations single-element vectors and matrices
+    -- (created from numeric literals or using 'scalar') automatically
+    -- expand to match the dimensions of the other operand:
+    --
+    -- >>> 5 + 2*ident 3 :: Matrix Double
+    -- (3><3)
+    --  [ 7.0, 5.0, 5.0
+    --  , 5.0, 7.0, 5.0
+    --  , 5.0, 5.0, 7.0 ]
+    --
+    -- >>> matrix 3 [1..9] + matrix 1 [10,20,30]
+    -- (3><3)
+    --  [ 11.0, 12.0, 13.0
+    --  , 24.0, 25.0, 26.0
+    --  , 37.0, 38.0, 39.0 ]
+    --
+
+    -- * Products
+    -- ** dot
+    dot, (<·>),
+    -- ** matrix-vector
+    app, (#>), (<#), (!#>),
+    -- ** matrix-matrix
+    mul, (<>),
+    -- | The matrix product is also implemented in the "Data.Monoid" instance, where
+    -- single-element matrices (created from numeric literals or using 'scalar')
+    -- are used for scaling.
+    --
+    -- >>> import Data.Monoid as M
+    -- >>>  let m = matrix 3 [1..6]
+    -- >>> m M.<> 2 M.<> diagl[0.5,1,0]
+    -- (2><3)
+    --  [ 1.0,  4.0, 0.0
+    --  , 4.0, 10.0, 0.0 ]
+    --
+    -- 'mconcat' uses 'optimiseMult' to get the optimal association order.
+
+
+    -- ** other
+    outer, kronecker, cross,
+    scale,
+    sumElements, prodElements,
+
+    -- * Linear Systems
+    (<\>),
+    linearSolve,
+    linearSolveLS,
+    linearSolveSVD,
+    luSolve,
+    cholSolve,
+    cgSolve,
+    cgSolve',
+
+    -- * Inverse and pseudoinverse
+    inv, pinv, pinvTol,
+
+    -- * Determinant and rank
+    rcond, rank,
+    det, invlndet,
+
+    -- * Norms
+    Normed(..),
+    norm_Frob, norm_nuclear,
+
+    -- * Nullspace and range
+    orth,
+    nullspace, null1, null1sym,
+
+    -- * SVD
+    svd,
+    thinSVD,
+    compactSVD,
+    singularValues,
+    leftSV, rightSV,
+
+    -- * Eigensystems
+    eig, eigSH, eigSH',
+    eigenvalues, eigenvaluesSH, eigenvaluesSH',
+    geigSH',
+
+    -- * QR
+    qr, rq, qrRaw, qrgr,
+
+    -- * Cholesky
+    chol, cholSH, mbCholSH,
+
+    -- * Hessenberg
+    hess,
+
+    -- * Schur
+    schur,
+
+    -- * LU
+    lu, luPacked,
+
+    -- * Matrix functions
+    expm,
+    sqrtm,
+    matFunc,
+
+    -- * Correlation and convolution
+    corr, conv, corrMin, corr2, conv2,
+
+    -- * Random arrays
+
+    Seed, RandDist(..), randomVector, rand, randn, gaussianSample, uniformSample,
+
+    -- * Misc
+    meanCov, rowOuters, pairwiseD2, unitary, peps, relativeError, haussholder, optimiseMult, udot, nullspaceSVD, orthSVD, ranksv,
+    ℝ,ℂ,iC,
+    -- * Auxiliary classes
+    Element, Container, Product, Numeric, LSDiv,
+    Complexable, RealElement,
+    RealOf, ComplexOf, SingleOf, DoubleOf,
+    IndexOf,
+    Field,
+--    Normed,
+    Transposable,
+    CGState(..),
+    Testable(..)
 ) where
 
-import Numeric.Container
-import Numeric.LinearAlgebra.Algorithms
+import Numeric.LinearAlgebra.Data
+
 import Numeric.Matrix()
 import Numeric.Vector()
+import Data.Packed.Numeric hiding ((<>), mul)
+import Numeric.LinearAlgebra.Algorithms hiding (linearSolve,Normed,orth)
+import qualified Numeric.LinearAlgebra.Algorithms as A
+import Numeric.LinearAlgebra.Util
+import Numeric.LinearAlgebra.Random
+import Numeric.Sparse((!#>))
+import Numeric.LinearAlgebra.Util.CG
+
+{- | infix synonym of 'mul'
+
+>>> let a = (3><5) [1..]
+>>> a
+(3><5)
+ [  1.0,  2.0,  3.0,  4.0,  5.0
+ ,  6.0,  7.0,  8.0,  9.0, 10.0
+ , 11.0, 12.0, 13.0, 14.0, 15.0 ]
+
+>>> let b = (5><2) [1,3, 0,2, -1,5, 7,7, 6,0]
+>>> b
+(5><2)
+ [  1.0, 3.0
+ ,  0.0, 2.0
+ , -1.0, 5.0
+ ,  7.0, 7.0
+ ,  6.0, 0.0 ]
+
+>>> a <> b
+(3><2)
+ [  56.0,  50.0
+ , 121.0, 135.0
+ , 186.0, 220.0 ]
+
+-}
+(<>) :: Numeric t => Matrix t -> Matrix t -> Matrix t
+(<>) = mXm
+infixr 8 <>
+
+-- | dense matrix product
+mul :: Numeric t => Matrix t -> Matrix t -> Matrix t
+mul = mXm
+
+
+{- | Solve a linear system (for square coefficient matrix and several right-hand sides) using the LU decomposition, returning Nothing for a singular system. For underconstrained or overconstrained systems use 'linearSolveLS' or 'linearSolveSVD'.
+
+@
+a = (2><2)
+ [ 1.0, 2.0
+ , 3.0, 5.0 ]
+@
+
+@
+b = (2><3)
+ [  6.0, 1.0, 10.0
+ , 15.0, 3.0, 26.0 ]
+@
+
+>>> linearSolve a b
+Just (2><3)
+ [ -1.4802973661668753e-15,     0.9999999999999997, 1.999999999999997
+ ,       3.000000000000001, 1.6653345369377348e-16, 4.000000000000002 ]
+
+>>> let Just x = it
+>>> disp 5 x
+2x3
+-0.00000  1.00000  2.00000
+ 3.00000  0.00000  4.00000
+
+>>> a <> x
+(2><3)
+ [  6.0, 1.0, 10.0
+ , 15.0, 3.0, 26.0 ]
+
+-}
+linearSolve m b = A.mbLinearSolve m b
+
+-- | return an orthonormal basis of the null space of a matrix. See also 'nullspaceSVD'.
+nullspace m = nullspaceSVD (Left (1*eps)) m (rightSV m)
+
+-- | return an orthonormal basis of the range space of a matrix. See also 'orthSVD'.
+orth m = orthSVD (Left (1*eps)) m (leftSV m)
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Algorithms.hs b/packages/base/src/Numeric/LinearAlgebra/Algorithms.hs
index 02ac6a0..0e085c1 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Algorithms.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Algorithms.hs
@@ -228,7 +228,9 @@ fromList [35.18264833189422,1.4769076999800903,1.089145439970417e-15]
 
 -}
 svd :: Field t => Matrix t -> (Matrix t, Vector Double, Matrix t)
-svd = {-# SCC "svd" #-} svd'
+svd = {-# SCC "svd" #-} g . svd'
+  where
+    g (u,s,v) = (u,s,tr v)
 
 {- | A version of 'svd' which returns only the @min (rows m) (cols m)@ singular vectors of @m@.
 
@@ -272,7 +274,10 @@ fromList [35.18264833189422,1.4769076999800903,1.089145439970417e-15]
 
 -}
 thinSVD :: Field t => Matrix t -> (Matrix t, Vector Double, Matrix t)
-thinSVD = {-# SCC "thinSVD" #-} thinSVD'
+thinSVD = {-# SCC "thinSVD" #-} g . thinSVD'
+  where
+    g (u,s,v) = (u,s,tr v)
+
 
 -- | Singular values only.
 singularValues :: Field t => Matrix t -> Vector Double
@@ -587,7 +592,7 @@ m = (3><3) [ 1, 0,    0
 -}
 
 pinvTol :: Field t => Double -> Matrix t -> Matrix t
-pinvTol t m = conj v' `mXm` diag s' `mXm` ctrans u' where
+pinvTol t m = v' `mXm` diag s' `mXm` ctrans u' where
     (u,s,v) = thinSVD m
     sl@(g:_) = toList s
     s' = real . fromList . map rec $ sl
@@ -649,7 +654,7 @@ nullspaceSVD hint a (s,v) = vs where
     k = case hint of
         Right t -> t
         _       -> rankSVD tol a s
-    vs = conj (dropColumns k v)
+    vs = dropColumns k v
 
 
 -- | The nullspace of a matrix. See also 'nullspaceSVD'.
@@ -935,10 +940,9 @@ relativeError' x y = dig (norm (x `sub` y) / norm x)
           dig r = round $ -logBase 10 (realToFrac r :: Double)
 
 
-relativeError :: (Normed c t, Num (c t)) => NormType -> c t -> c t -> Double
-relativeError t a b = realToFrac r
+relativeError :: Num a => (a -> Double) -> a -> a -> Double
+relativeError norm a b = r
   where
-    norm = pnorm t
     na = norm a
     nb = norm b
     nab = norm (a-b)
diff --git a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
index 677f9ee..8e67eb4 100644
--- a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
@@ -1,4 +1,4 @@
------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 {- |
 Module      :  Numeric.LinearAlgebra.HMatrix
 Copyright   :  (c) Alberto Ruiz 2006-14
@@ -7,229 +7,11 @@ Maintainer  :  Alberto Ruiz
 Stability   :  provisional
 
 -}
------------------------------------------------------------------------------
-module Numeric.LinearAlgebra.HMatrix (
-
-    -- * Basic types and data processing
-    module Numeric.LinearAlgebra.Data,
-
-    -- * Arithmetic and numeric classes
-    -- |
-    -- The standard numeric classes are defined elementwise:
-    --
-    -- >>>  vector [1,2,3] * vector [3,0,-2]
-    -- fromList [3.0,0.0,-6.0]
-    --
-    -- >>> matrix 3 [1..9] * ident 3
-    -- (3><3)
-    --  [ 1.0, 0.0, 0.0
-    --  , 0.0, 5.0, 0.0
-    --  , 0.0, 0.0, 9.0 ]
-    --
-    -- In arithmetic operations single-element vectors and matrices
-    -- (created from numeric literals or using 'scalar') automatically
-    -- expand to match the dimensions of the other operand:
-    --
-    -- >>> 5 + 2*ident 3 :: Matrix Double
-    -- (3><3)
-    --  [ 7.0, 5.0, 5.0
-    --  , 5.0, 7.0, 5.0
-    --  , 5.0, 5.0, 7.0 ]
-    --
-    -- >>> matrix 3 [1..9] + matrix 1 [10,20,30]
-    -- (3><3)
-    --  [ 11.0, 12.0, 13.0
-    --  , 24.0, 25.0, 26.0
-    --  , 37.0, 38.0, 39.0 ]
-    --
-
-    -- * Products
-    -- ** dot
-    dot, (<·>),
-    -- ** matrix-vector
-    app, (#>), (!#>),
-    -- ** matrix-matrix
-    mul, (<>),
-    -- | The matrix product is also implemented in the "Data.Monoid" instance, where
-    -- single-element matrices (created from numeric literals or using 'scalar')
-    -- are used for scaling.
-    --
-    -- >>> import Data.Monoid as M
-    -- >>>  let m = matrix 3 [1..6]
-    -- >>> m M.<> 2 M.<> diagl[0.5,1,0]
-    -- (2><3)
-    --  [ 1.0,  4.0, 0.0
-    --  , 4.0, 10.0, 0.0 ]
-    --
-    -- 'mconcat' uses 'optimiseMult' to get the optimal association order.
-
-
-    -- ** other
-    outer, kronecker, cross,
-    scale,
-    sumElements, prodElements,
-
-    -- * Linear Systems
-    (<\>),
-    linearSolve,
-    linearSolveLS,
-    linearSolveSVD,
-    luSolve,
-    cholSolve,
-    cgSolve,
-    cgSolve',
-
-    -- * Inverse and pseudoinverse
-    inv, pinv, pinvTol,
-
-    -- * Determinant and rank
-    rcond, rank,
-    det, invlndet,
-
-    -- * Norms
-    Normed(..),
-    norm_Frob, norm_nuclear,
-
-    -- * Nullspace and range
-    orth,
-    nullspace, null1, null1sym,
-
-    -- * SVD
-    svd,
-    thinSVD,
-    compactSVD,
-    singularValues,
-    leftSV, rightSV,
-
-    -- * Eigensystems
-    eig, eigSH, eigSH',
-    eigenvalues, eigenvaluesSH, eigenvaluesSH',
-    geigSH',
-
-    -- * QR
-    qr, rq, qrRaw, qrgr,
-
-    -- * Cholesky
-    chol, cholSH, mbCholSH,
-
-    -- * Hessenberg
-    hess,
-
-    -- * Schur
-    schur,
-
-    -- * LU
-    lu, luPacked,
-
-    -- * Matrix functions
-    expm,
-    sqrtm,
-    matFunc,
-
-    -- * Correlation and convolution
-    corr, conv, corrMin, corr2, conv2,
-
-    -- * Random arrays
+--------------------------------------------------------------------------------
 
-    Seed, RandDist(..), randomVector, rand, randn, gaussianSample, uniformSample,
-
-    -- * Misc
-    meanCov, rowOuters, peps, relativeError, haussholder, optimiseMult, udot, nullspaceSVD, orthSVD, ranksv,
-    ℝ,ℂ,iC,
-    -- * Auxiliary classes
-    Element, Container, Product, Numeric, LSDiv,
-    Complexable, RealElement,
-    RealOf, ComplexOf, SingleOf, DoubleOf,
-    IndexOf,
-    Field,
---    Normed,
-    Transposable,
-    CGState(..),
-    Testable(..)
+module Numeric.LinearAlgebra.HMatrix (
+    module Numeric.LinearAlgebra
 ) where
 
-import Numeric.LinearAlgebra.Data
-
-import Numeric.Matrix()
-import Numeric.Vector()
-import Data.Packed.Numeric hiding ((<>), mul)
-import Numeric.LinearAlgebra.Algorithms hiding (linearSolve,Normed,orth)
-import qualified Numeric.LinearAlgebra.Algorithms as A
-import Numeric.LinearAlgebra.Util
-import Numeric.LinearAlgebra.Random
-import Numeric.Sparse((!#>))
-import Numeric.LinearAlgebra.Util.CG
-
-{- | infix synonym of 'mul'
-
->>> let a = (3><5) [1..]
->>> a
-(3><5)
- [  1.0,  2.0,  3.0,  4.0,  5.0
- ,  6.0,  7.0,  8.0,  9.0, 10.0
- , 11.0, 12.0, 13.0, 14.0, 15.0 ]
-
->>> let b = (5><2) [1,3, 0,2, -1,5, 7,7, 6,0]
->>> b
-(5><2)
- [  1.0, 3.0
- ,  0.0, 2.0
- , -1.0, 5.0
- ,  7.0, 7.0
- ,  6.0, 0.0 ]
-
->>> a <> b
-(3><2)
- [  56.0,  50.0
- , 121.0, 135.0
- , 186.0, 220.0 ]
-
--}
-(<>) :: Numeric t => Matrix t -> Matrix t -> Matrix t
-(<>) = mXm
-infixr 8 <>
-
--- | dense matrix product
-mul :: Numeric t => Matrix t -> Matrix t -> Matrix t
-mul = mXm
-
-
-{- | Solve a linear system (for square coefficient matrix and several right-hand sides) using the LU decomposition, returning Nothing for a singular system. For underconstrained or overconstrained systems use 'linearSolveLS' or 'linearSolveSVD'.
-
-@
-a = (2><2)
- [ 1.0, 2.0
- , 3.0, 5.0 ]
-@
-
-@
-b = (2><3)
- [  6.0, 1.0, 10.0
- , 15.0, 3.0, 26.0 ]
-@
-
->>> linearSolve a b
-Just (2><3)
- [ -1.4802973661668753e-15,     0.9999999999999997, 1.999999999999997
- ,       3.000000000000001, 1.6653345369377348e-16, 4.000000000000002 ]
-
->>> let Just x = it
->>> disp 5 x
-2x3
--0.00000  1.00000  2.00000
- 3.00000  0.00000  4.00000
-
->>> a <> x
-(2><3)
- [  6.0, 1.0, 10.0
- , 15.0, 3.0, 26.0 ]
-
--}
-linearSolve m b = A.mbLinearSolve m b
-
--- | return an orthonormal basis of the null space of a matrix. See also 'nullspaceSVD'.
-nullspace m = nullspaceSVD (Left (1*eps)) m (rightSV m)
-
--- | return an orthonormal basis of the range space of a matrix. See also 'orthSVD'.
-orth m = orthSVD (Left (1*eps)) m (leftSV m)
+import Numeric.LinearAlgebra
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/LAPACK.hs b/packages/base/src/Numeric/LinearAlgebra/LAPACK.hs
index e088fdc..d96e14f 100644
--- a/packages/base/src/Numeric/LinearAlgebra/LAPACK.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/LAPACK.hs
@@ -115,7 +115,7 @@ svdAux f st x = unsafePerformIO $ do
     s <- createVector (min r c)
     v <- createMatrix ColumnMajor c c
     app4 f mat x mat u vec s mat v st
-    return (u,s,trans v)
+    return (u,s,v)
   where r = rows x
         c = cols x
 
@@ -141,7 +141,7 @@ thinSVDAux f st x = unsafePerformIO $ do
     s <- createVector q
     v <- createMatrix ColumnMajor q c
     app4 f mat x mat u vec s mat v st
-    return (u,s,trans v)
+    return (u,s,v)
   where r = rows x
         c = cols x
         q = min r c
@@ -185,7 +185,7 @@ rightSVAux f st x = unsafePerformIO $ do
     s <- createVector q
     v <- createMatrix ColumnMajor c c
     app3 g mat x vec s mat v st
-    return (s,trans v)
+    return (s,v)
   where r = rows x
         c = cols x
         q = min r c
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs
index 3398e6a..25b10b4 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Static.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs
@@ -1,5 +1,3 @@
-#if __GLASGOW_HASKELL__ >= 708
-
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -13,7 +11,6 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE OverlappingInstances #-}
 {-# LANGUAGE TypeFamilies #-}
 
 
@@ -63,13 +60,13 @@ module Numeric.LinearAlgebra.Static(
 
 
 import GHC.TypeLits
-import Numeric.LinearAlgebra.HMatrix hiding (
+import Numeric.LinearAlgebra hiding (
     (<>),(#>),(<·>),Konst(..),diag, disp,(¦),(——),
     row,col,vector,matrix,linspace,toRows,toColumns,
     (<\>),fromList,takeDiag,svd,eig,eigSH,eigSH',
     eigenvalues,eigenvaluesSH,eigenvaluesSH',build,
     qr,size,app,mul,dot,chol)
-import qualified Numeric.LinearAlgebra.HMatrix as LA
+import qualified Numeric.LinearAlgebra as LA
 import Data.Proxy(Proxy)
 import Numeric.LinearAlgebra.Static.Internal
 import Control.Arrow((***))
@@ -184,8 +181,9 @@ a ¦ b = tr (tr a —— tr b)
 type Sq n  = L n n
 --type CSq n = CL n n
 
-type GL = forall n m. (KnownNat n, KnownNat m) => L m n
-type GSq = forall n. KnownNat n => Sq n
+
+type GL = forall n m . (KnownNat n, KnownNat m) => L m n
+type GSq = forall n . KnownNat n => Sq n
 
 isKonst :: forall m n . (KnownNat m, KnownNat n) => L m n -> Maybe (ℝ,(Int,Int))
 isKonst s@(unwrap -> x)
@@ -618,23 +616,3 @@ instance (KnownNat n', KnownNat m') => Testable (L n' m')
   where
     checkT _ = test
 
-#else
-
-{- |
-Module      :  Numeric.LinearAlgebra.Static
-Copyright   :  (c) Alberto Ruiz 2014
-License     :  BSD3
-Stability   :  experimental
-
-Experimental interface with statically checked dimensions.
-
-This module requires GHC >= 7.8
-
--}
-
-module Numeric.LinearAlgebra.Static
-{-# WARNING "This module requires GHC >= 7.8" #-}
-where
-
-#endif
-
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static/Internal.hs b/packages/base/src/Numeric/LinearAlgebra/Static/Internal.hs
index ec02cf6..a5fc29b 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Static/Internal.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Static/Internal.hs
@@ -24,8 +24,8 @@ module Numeric.LinearAlgebra.Static.Internal where
 
 
 import GHC.TypeLits
-import qualified Numeric.LinearAlgebra.HMatrix as LA
-import Numeric.LinearAlgebra.HMatrix hiding (konst,size)
+import qualified Numeric.LinearAlgebra as LA
+import Numeric.LinearAlgebra hiding (konst,size)
 import Data.Packed as D
 import Data.Packed.ST
 import Data.Proxy(Proxy)
diff --git a/packages/base/src/Numeric/LinearAlgebra/Util.hs b/packages/base/src/Numeric/LinearAlgebra/Util.hs
index 043aa21..370ca27 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Util.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Util.hs
@@ -16,7 +16,6 @@ Stability   :  provisional
 
 -}
 -----------------------------------------------------------------------------
-{-# OPTIONS_HADDOCK hide #-}
 
 module Numeric.LinearAlgebra.Util(
 
@@ -53,18 +52,7 @@ module Numeric.LinearAlgebra.Util(
     -- ** 1D
     corr, conv, corrMin,
     -- ** 2D
-    corr2, conv2, separable,
-    -- * Tools for the Kronecker product
-    --
-    -- | (see A. Fusiello, A matter of notation: Several uses of the Kronecker product in
-    --  3d computer vision, Pattern Recognition Letters 28 (15) (2007) 2127-2132)
-
-    --
-    -- | @`vec` (a \<> x \<> b) == ('trans' b ` 'kronecker' ` a) \<> 'vec' x@
-    vec,
-    vech,
-    dup,
-    vtrans
+    corr2, conv2, separable
 ) where
 
 import Data.Packed.Numeric
@@ -227,10 +215,11 @@ infixl 9 ¿
 (¿)= flip extractColumns
 
 
-cross :: Vector Double -> Vector Double -> Vector Double
--- ^ cross product (for three-element real vectors)
+cross :: Product t => Vector t -> Vector t -> Vector t
+-- ^ cross product (for three-element vectors)
 cross x y | dim x == 3 && dim y == 3 = fromList [z1,z2,z3]
-          | otherwise = error $ "cross ("++show x++") ("++show y++")"
+          | otherwise = error $ "the cross product requires 3-element vectors (sizes given: "
+                                ++show (dim x)++" and "++show (dim y)++")"
   where
     [x1,x2,x3] = toList x
     [y1,y2,y3] = toList y
@@ -238,6 +227,9 @@ cross x y | dim x == 3 && dim y == 3 = fromList [z1,z2,z3]
     z2 = x3*y1-x1*y3
     z3 = x1*y2-x2*y1
 
+{-# SPECIALIZE cross :: Vector Double -> Vector Double -> Vector Double #-}
+{-# SPECIALIZE cross :: Vector (Complex Double) -> Vector (Complex Double) -> Vector (Complex Double) #-}
+
 norm :: Vector Double -> Double
 -- ^ 2-norm of real vector
 norm = pnorm PNorm2
@@ -403,40 +395,6 @@ null1sym = last . toColumns . snd . eigSH'
 
 --------------------------------------------------------------------------------
 
-vec :: Element t => Matrix t -> Vector t
--- ^ stacking of columns
-vec = flatten . trans
-
-
-vech :: Element t => Matrix t -> Vector t
--- ^ half-vectorization (of the lower triangular part)
-vech m = vjoin . zipWith f [0..] . toColumns $ m
-  where
-    f k v = subVector k (dim v - k) v
-
-
-dup :: (Num t, Num (Vector t), Element t) => Int -> Matrix t
--- ^ duplication matrix (@'dup' k \<> 'vech' m == 'vec' m@, for symmetric m of 'dim' k)
-dup k = trans $ fromRows $ map f es
-  where
-    rs = zip [0..] (toRows (ident (k^(2::Int))))
-    es = [(i,j) | j <- [0..k-1], i <- [0..k-1], i>=j ]
-    f (i,j) | i == j = g (k*j + i)
-            | otherwise = g (k*j + i) + g (k*i + j)
-    g j = v
-      where
-        Just v = lookup j rs
-
-
-vtrans :: Element t => Int -> Matrix t -> Matrix t
--- ^ generalized \"vector\" transposition: @'vtrans' 1 == 'trans'@, and @'vtrans' ('rows' m) m == 'asColumn' ('vec' m)@
-vtrans p m | r == 0 = fromBlocks . map (map asColumn . takesV (replicate q p)) . toColumns $ m
-           | otherwise = error $ "vtrans " ++ show p ++ " of matrix with " ++ show (rows m) ++ " rows"
-  where
-    (q,r) = divMod (rows m) p
-
---------------------------------------------------------------------------------
-
 infixl 0 ~!~
 c ~!~ msg = when c (error msg)
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs b/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs
index b82c74f..899a5bf 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs
@@ -9,7 +9,7 @@ module Numeric.LinearAlgebra.Util.CG(
 import Data.Packed.Numeric
 import Numeric.Sparse
 import Numeric.Vector()
-import Numeric.LinearAlgebra.Algorithms(linearSolveLS, relativeError, NormType(..))
+import Numeric.LinearAlgebra.Algorithms(linearSolveLS, relativeError, pnorm, NormType(..))
 import Control.Arrow((***))
 
 {-
@@ -142,13 +142,13 @@ instance Testable GMatrix
             print s3; print d3
             print s4; print d4
             print s5; print d5
-            print $ relativeError Infinity s5 d5
+            print $ relativeError (pnorm Infinity) s5 d5
 
         ok = s1==d1
           && s2==d2
           && s3==d3
           && s4==d4
-          && relativeError Infinity s5 d5 < 1E-10
+          && relativeError (pnorm Infinity) s5 d5 < 1E-10
 
         disp = putStr . dispf 2
 
diff --git a/packages/base/src/Numeric/Vectorized.hs b/packages/base/src/Numeric/Vectorized.hs
index 6f0d240..405ae01 100644
--- a/packages/base/src/Numeric/Vectorized.hs
+++ b/packages/base/src/Numeric/Vectorized.hs
@@ -37,7 +37,6 @@ import Foreign.C.String
 import System.IO.Unsafe(unsafePerformIO)
 
 import Control.Monad(when)
-import Control.Applicative((<$>))