4 files changed, 106 insertions, 7 deletions

diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal
index 06c1a3c..8f6b04b 100644
--- a/packages/base/hmatrix.cabal
+++ b/packages/base/hmatrix.cabal
@@ -48,7 +48,7 @@ library
                         Numeric.LinearAlgebra.Data
 
                         Numeric.LinearAlgebra.Compat
-                        Data.Packed.Internal.Sparse
+                        
                         
     other-modules:      Data.Packed.Internal,
                         Data.Packed.Internal.Common,
@@ -62,8 +62,10 @@ library
                         Numeric.Matrix
                         Data.Packed.Internal.Numeric
                         Numeric.LinearAlgebra.Util.Convolution
+                        Numeric.LinearAlgebra.Util.CG
                         Numeric.LinearAlgebra.Random
                         Numeric.Conversion
+                        Numeric.Sparse
 
     C-sources:          src/C/lapack-aux.c
                         src/C/vector-aux.c
diff --git a/packages/base/src/Numeric/LinearAlgebra/Data.hs b/packages/base/src/Numeric/LinearAlgebra/Data.hs
index 49bc1c0..e3cbe31 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Data.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Data.hs
@@ -69,5 +69,5 @@ import Data.Packed.Matrix
 import Numeric.Container
 import Numeric.LinearAlgebra.Util
 import Data.Complex
-import Data.Packed.Internal.Sparse
+import Numeric.Sparse
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs b/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs
new file mode 100644
index 0000000..2c782e8
--- /dev/null
+++ b/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs
@@ -0,0 +1,96 @@
+{-# LANGUAGE FlexibleContexts, FlexibleInstances #-}
+{-# LANGUAGE RecordWildCards #-}
+
+module Numeric.LinearAlgebra.Util.CG(
+    cgSolve,
+    CGMat
+) where
+
+import Numeric.Container
+import Numeric.Vector()
+
+{-
+import Util.Misc(debug, debugMat)
+
+(//) :: Show a => a -> String -> a
+infix 0 // -- , ///
+a // b = debug b id a
+
+(///) :: DV -> String -> DV
+infix 0 ///
+v /// b = debugMat b 2 asRow v
+-}
+
+
+type DV = Vector Double
+
+data CGState = CGState
+    { cgp  :: DV
+    , cgr  :: DV
+    , cgr2 :: Double
+    , cgx  :: DV
+    , cgdx :: Double
+    }
+
+cg :: Bool -> (DV -> DV) -> (DV -> DV) -> CGState -> CGState
+cg sym at a (CGState p r r2 x _) = CGState p' r' r'2 x' rdx
+  where
+    ap1 = a p
+    ap  | sym       = ap1
+        | otherwise = at ap1
+    pap | sym       = p ◇ ap1
+        | otherwise = norm2 ap1 ** 2
+    alpha = r2 / pap
+    dx = scale alpha p
+    x' = x + dx
+    r' = r - scale alpha ap
+    r'2 = r' ◇ r'
+    beta = r'2 / r2
+    p' = r' + scale beta p
+
+    rdx = norm2 dx / max 1 (norm2 x)
+
+conjugrad
+  :: (Transposable m, Contraction m DV DV)
+  => Bool -> m -> DV -> DV -> Double -> Double -> [CGState]
+conjugrad sym a b = solveG (tr a ◇) (a ◇) (cg sym) b
+
+solveG
+    :: (DV -> DV) -> (DV -> DV)
+    -> ((DV -> DV) -> (DV -> DV) -> CGState -> CGState)
+    -> DV
+    -> DV
+    -> Double -> Double
+    -> [CGState]
+solveG mat ma meth rawb x0' ϵb ϵx
+    = takeUntil ok . iterate (meth mat ma) $ CGState p0 r0 r20 x0 1
+  where
+    a = mat . ma
+    b = mat rawb
+    x0  = if x0' == 0 then konst 0 (dim b) else x0'
+    r0  = b - a x0
+    r20 = r0 ◇ r0
+    p0  = r0
+    nb2 = b ◇ b
+    ok CGState {..}
+        =  cgr2 <nb2*ϵb**2
+        || cgdx < ϵx
+
+
+takeUntil :: (a -> Bool) -> [a] -> [a]
+takeUntil q xs = a++ take 1 b
+  where
+    (a,b) = break q xs
+
+class (Transposable m, Contraction m (Vector Double) (Vector Double)) => CGMat m
+
+cgSolve
+  :: CGMat m
+  => Bool   -- ^ symmetric
+  -> Double -- ^ relative tolerance for the residual (e.g. 1E-4)
+  -> Double -- ^ relative tolerance for δx (e.g. 1E-3)
+  -> m      -- ^ coefficient matrix
+  -> Vector Double -- ^ right-hand side
+  -> Vector Double -- ^ solution
+cgSolve sym er es a b  = cgx $ last $ conjugrad sym a b 0 er es
+
diff --git a/packages/base/src/Data/Packed/Internal/Sparse.hs b/packages/base/src/Numeric/Sparse.hs
index 544c913..3835590 100644
--- a/packages/base/src/Data/Packed/Internal/Sparse.hs
+++ b/packages/base/src/Numeric/Sparse.hs
@@ -2,9 +2,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleInstances #-}
 
-
-
-module Data.Packed.Internal.Sparse(
+module Numeric.Sparse(
     SMatrix(..),
     mkCSR, mkDiag,
     AssocMatrix,
@@ -19,7 +17,8 @@ import Control.Arrow((***))
 import Control.Monad(when)
 import Data.List(groupBy, sort)
 import Foreign.C.Types(CInt(..))
-import Numeric.LinearAlgebra.Devel
+import Numeric.LinearAlgebra.Util.CG(CGMat)
+import Data.Packed.Development
 import System.IO.Unsafe(unsafePerformIO)
 import Foreign(Ptr)
 import Text.Printf(printf)
@@ -127,7 +126,7 @@ toDense asm = assoc (r+1,c+1) 0 asm
 
 
 
-instance Transposable (SMatrix)
+instance Transposable SMatrix
   where
     tr (CSR vs cs rs n m) = CSC vs cs rs m n
     tr (CSC vs rs cs n m) = CSR vs rs cs m n
@@ -138,6 +137,8 @@ instance Transposable (Matrix Double)
     tr = trans
 
 
+instance CGMat SMatrix
+instance CGMat (Matrix Double)
 
 --------------------------------------------------------------------------------