X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FLinear%2FMatrix.hs;h=2d7347230b71281a8ec4562b67e160958e1baf7e;hb=cc6e96512831fd319a185b1f5ef513a19b69c853;hp=3af2788ee4c0a3796cd781ae717c2553ca676bce;hpb=3a58695c57f57c9adbc0fb2ca26e06e7da7bfd63;p=numerical-analysis.git

diff --git a/src/Linear/Matrix.hs b/src/Linear/Matrix.hs
index 3af2788..2d73472 100644
--- a/src/Linear/Matrix.hs
+++ b/src/Linear/Matrix.hs
@@ -20,6 +20,7 @@ import Data.List (intercalate)
 import Data.Vector.Fixed (
   (!),
   generate,
+  mk0,
   mk1,
   mk2,
   mk3,
@@ -27,23 +28,25 @@ import Data.Vector.Fixed (
   mk5 )
 import qualified Data.Vector.Fixed as V (
   and,
+  foldl,
   fromList,
   head,
   ifoldl,
   ifoldr,
   imap,
   map,
-  maximum,
   replicate,
   reverse,
   toList,
   zipWith )
 import Data.Vector.Fixed.Cont ( Arity, arity )
 import Linear.Vector ( Vec, delete )
-import Naturals ( N1, N2, N3, N4, N5, N6, N7, N8, N9, N10, S, Z )
+import Naturals
 import Normed ( Normed(..) )
 
-import NumericPrelude hiding ( (*), abs )
+-- We want the "max" that works on Ord, not the one that only works on
+-- Bool/Integer from the Lattice class!
+import NumericPrelude hiding ( (*), abs, max)
 import qualified NumericPrelude as NP ( (*) )
 import qualified Algebra.Absolute as Absolute ( C )
 import Algebra.Absolute ( abs )
@@ -56,12 +59,13 @@ import qualified Algebra.Module as Module ( C )
 import qualified Algebra.RealRing as RealRing ( C )
 import qualified Algebra.ToRational as ToRational ( C )
 import qualified Algebra.Transcendental as Transcendental ( C )
-import qualified Prelude as P ( map )
+import qualified Prelude as P ( map, max)
 
 -- | Our main matrix type.
 data Mat m n a = (Arity m, Arity n) => Mat (Vec m (Vec n a))
 
 -- Type synonyms for n-by-n matrices.
+type Mat0 a = Mat Z Z a
 type Mat1 a = Mat N1 N1 a
 type Mat2 a = Mat N2 N2 a
 type Mat3 a = Mat N3 N3 a
@@ -86,6 +90,7 @@ type Row5 a = Row N5 a
 -- | Type synonym for column vectors expressed as n-by-1 matrices.
 type Col n a = Mat n N1 a
 
+type Col0 a = Col Z a
 type Col1 a = Col N1 a
 type Col2 a = Col N2 a
 type Col3 a = Col N3 a
@@ -95,7 +100,29 @@ type Col6 a = Col N6 a
 type Col7 a = Col N7 a
 type Col8 a = Col N8 a
 type Col9 a = Col N9 a
-type Col10 a = Col N10 a -- We need a big column for Gaussian quadrature.
+type Col10 a = Col N10 a
+type Col11 a = Col N11 a
+type Col12 a = Col N12 a
+type Col13 a = Col N13 a
+type Col14 a = Col N14 a
+type Col15 a = Col N15 a
+type Col16 a = Col N16 a
+type Col17 a = Col N17 a
+type Col18 a = Col N18 a
+type Col19 a = Col N19 a
+type Col20 a = Col N20 a
+type Col21 a = Col N21 a
+type Col22 a = Col N22 a
+type Col23 a = Col N23 a
+type Col24 a = Col N24 a
+type Col25 a = Col N25 a
+type Col26 a = Col N26 a
+type Col27 a = Col N27 a
+type Col28 a = Col N28 a
+type Col29 a = Col N29 a
+type Col30 a = Col N30 a
+type Col31 a = Col N31 a
+type Col32 a = Col N32 a
 
 
 instance (Eq a) => Eq (Mat m n a) where
@@ -326,15 +353,21 @@ identity_matrix =
 --   >>> frobenius_norm (r - (transpose expected)) < 1e-12
 --   True
 --
-cholesky :: forall m n a. (Algebraic.C a, Arity m, Arity n)
-         => (Mat m n a) -> (Mat m n a)
-cholesky m = construct r
+cholesky :: forall m a. (Algebraic.C a, Arity m)
+         => (Mat m m a) -> (Mat m m a)
+cholesky m = ifoldl2 f zero m
   where
-    r :: Int -> Int -> a
-    r i j | i == j = sqrt(m !!! (i,j) - sum [(r k i)^2 | k <- [0..i-1]])
-          | i < j =
-              (((m !!! (i,j)) - sum [(r k i) NP.* (r k j) | k <- [0..i-1]]))/(r i i)
-          | otherwise = 0
+    f :: Int -> Int -> (Mat m m a) -> a -> (Mat m m a)
+    f i j cur_R _ = set_idx cur_R (i,j) (r cur_R i j)
+
+    r :: (Mat m m a) -> Int -> Int -> a
+    r cur_R i j
+      | i == j = sqrt(m !!! (i,j) - sum [(cur_R !!! (k,i))^2 | k <- [0..i-1]])
+      | i < j = (((m !!! (i,j))
+                  - sum [(cur_R !!! (k,i)) NP.* (cur_R !!! (k,j))
+                             | k <- [0..i-1]]))/(cur_R !!! (i,i))
+      | otherwise = 0
+
 
 
 -- | Returns True if the given matrix is upper-triangular, and False
@@ -571,6 +604,7 @@ instance (Ring.C a, Arity m, Arity n) => Additive.C (Mat m n a) where
 instance (Ring.C a, Arity m, Arity n, m ~ n) => Ring.C (Mat (S m) (S n) a) where
   -- The first * is ring multiplication, the second is matrix
   -- multiplication.
+  one = identity_matrix
   m1 * m2 = m1 * m2
 
 
@@ -584,8 +618,8 @@ instance (Absolute.C a,
           Algebraic.C a,
           ToRational.C a,
           Arity m)
-         => Normed (Col (S m) a) where
-  -- | Generic p-norms for vectors in R^n that are represented as n-by-1
+         => Normed (Col m a) where
+  -- | Generic p-norms for vectors in R^m that are represented as m-by-1
   --   matrices.
   --
   --   Examples:
@@ -600,6 +634,10 @@ instance (Absolute.C a,
   --   >>> norm_p 1 v1 :: Double
   --   2.0
   --
+  --   >>> let v1 = vec0d :: Col0 Double
+  --   >>> norm v1
+  --   0.0
+  --
   norm_p p (Mat rows) =
     (root p') $ sum [fromRational' (toRational $ abs x)^p' | x <- xs]
     where
@@ -615,7 +653,8 @@ instance (Absolute.C a,
   --   5
   --
   norm_infty (Mat rows) =
-    fromRational' $ toRational $ V.maximum $ V.map V.maximum rows
+    fromRational' $ toRational
+                      $ (V.foldl P.max 0) $ V.map (V.foldl P.max 0) rows
 
 
 -- | Compute the Frobenius norm of a matrix. This essentially treats
@@ -660,6 +699,9 @@ frobenius_norm matrix =
 --   >>> fixed_point g eps u0
 --   ((1.0728549599342185),(1.0820591495686167))
 --
+vec0d :: Col0 a
+vec0d = Mat mk0
+
 vec1d :: (a) -> Col1 a
 vec1d (x) = Mat (mk1 (mk1 x))