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

diff --git a/src/Linear/Matrix.hs b/src/Linear/Matrix.hs
index 2422eef..3af2788 100644
--- a/src/Linear/Matrix.hs
+++ b/src/Linear/Matrix.hs
@@ -39,7 +39,7 @@ import qualified Data.Vector.Fixed as V (
   toList,
   zipWith )
 import Data.Vector.Fixed.Cont ( Arity, arity )
-import Linear.Vector ( Vec, delete, element_sum )
+import Linear.Vector ( Vec, delete )
 import Naturals ( N1, N2, N3, N4, N5, N6, N7, N8, N9, N10, S, Z )
 import Normed ( Normed(..) )
 
@@ -67,6 +67,8 @@ type Mat2 a = Mat N2 N2 a
 type Mat3 a = Mat N3 N3 a
 type Mat4 a = Mat N4 N4 a
 type Mat5 a = Mat N5 N5 a
+type Mat6 a = Mat N6 N6 a
+type Mat7 a = Mat N7 N7 a
 
 -- * Type synonyms for 1-by-n row "vectors".
 
@@ -109,8 +111,8 @@ instance (Eq a) => Eq (Mat m n a) where
   --   >>> m1 == m3
   --   False
   --
-  (Mat rows1) == (Mat rows2) =
-    V.and $ V.zipWith comp rows1 rows2
+  (Mat rows_one) == (Mat rows_two) =
+    V.and $ V.zipWith comp rows_one rows_two
     where
       -- Compare a row, one column at a time.
       comp row1 row2 = V.and (V.zipWith (==) row1 row2)
@@ -546,28 +548,27 @@ instance (Ord a,
 --
 infixl 7 *
 (*) :: (Ring.C a, Arity m, Arity n, Arity p)
-        => Mat m n a
-        -> Mat n p a
-        -> Mat m p a
+        => Mat (S m) (S n) a
+        -> Mat (S n) (S p) a
+        -> Mat (S m) (S p) a
 (*) m1 m2 = construct lambda
   where
-    lambda i j =
-      sum [(m1 !!! (i,k)) NP.* (m2 !!! (k,j)) | k <- [0..(ncols m1)-1] ]
+    lambda i j = (transpose $ row m1 i) `dot` (column m2 j)
 
 
 
 instance (Ring.C a, Arity m, Arity n) => Additive.C (Mat m n a) where
 
-  (Mat rows1) + (Mat rows2) =
-    Mat $ V.zipWith (V.zipWith (+)) rows1 rows2
+  (Mat rows_one) + (Mat rows_two) =
+    Mat $ V.zipWith (V.zipWith (+)) rows_one rows_two
 
-  (Mat rows1) - (Mat rows2) =
-    Mat $ V.zipWith (V.zipWith (-)) rows1 rows2
+  (Mat rows_one) - (Mat rows_two) =
+    Mat $ V.zipWith (V.zipWith (-)) rows_one rows_two
 
   zero = Mat (V.replicate $ V.replicate (fromInteger 0))
 
 
-instance (Ring.C a, Arity m, Arity n, m ~ n) => Ring.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.
   m1 * m2 = m1 * m2
@@ -579,11 +580,12 @@ instance (Ring.C a, Arity m, Arity n) => Module.C a (Mat m n a) where
   x *> (Mat rows) = Mat $ V.map (V.map (NP.* x)) rows
 
 
-instance (Algebraic.C a,
+instance (Absolute.C a,
+          Algebraic.C a,
           ToRational.C a,
           Arity m)
-         => Normed (Mat (S m) N1 a) where
-  -- | Generic p-norms for vectors in R^n that are represented as nx1
+         => Normed (Col (S m) a) where
+  -- | Generic p-norms for vectors in R^n that are represented as n-by-1
   --   matrices.
   --
   --   Examples:
@@ -594,8 +596,12 @@ instance (Algebraic.C a,
   --   >>> norm_p 2 v1
   --   5.0
   --
+  --   >>> let v1 = vec2d (-1,1) :: Col2 Double
+  --   >>> norm_p 1 v1 :: Double
+  --   2.0
+  --
   norm_p p (Mat rows) =
-    (root p') $ sum [fromRational' (toRational x)^p' | x <- xs]
+    (root p') $ sum [fromRational' (toRational $ abs x)^p' | x <- xs]
     where
       p' = toInteger p
       xs = concat $ V.toList $ V.map V.toList rows
@@ -626,12 +632,13 @@ instance (Algebraic.C a,
 --   >>> frobenius_norm m == 3
 --   True
 --
-frobenius_norm :: (Algebraic.C a, Ring.C a) => Mat m n a -> a
-frobenius_norm (Mat rows) =
-  sqrt $ element_sum $ V.map row_sum rows
+frobenius_norm :: (Arity m, Arity n, Algebraic.C a, Ring.C a)
+               => Mat m n a
+               -> a
+frobenius_norm matrix =
+  sqrt $ element_sum2 $ squares
   where
-    -- | Square and add up the entries of a row.
-    row_sum = element_sum . V.map (^2)
+    squares = map2 (^2) matrix
 
 
 -- Vector helpers. We want it to be easy to create low-dimension
@@ -683,7 +690,7 @@ dot :: (Ring.C a, Arity m)
        => Col (S m) a
        -> Col (S m) a
        -> a
-v1 `dot` v2 = unscalar $ ((transpose v1) * v2)
+v1 `dot` v2 = element_sum2 $ zipwith2 (NP.*) v1 v2
 
 
 -- | The angle between @v1@ and @v2@ in Euclidean space.
@@ -829,10 +836,8 @@ ut_part_strict = transpose . lt_part_strict . transpose
 --   15
 --
 trace :: (Arity m, Ring.C a) => Mat m m a -> a
-trace matrix =
-  let (Mat rows) = diagonal matrix
-  in
-    element_sum $ V.map V.head rows
+trace = element_sum2 . diagonal
+
 
 
 -- | Zip together two matrices.
@@ -851,7 +856,7 @@ trace matrix =
 --   >>> zip2 m1 m2
 --   (((1,1),(2,1)),((3,1),(4,1)))
 --
-zip2 :: (Arity m, Arity n) => Mat m n a -> Mat m n a -> Mat m n (a,a)
+zip2 :: (Arity m, Arity n) => Mat m n a -> Mat m n b -> Mat m n (a,b)
 zip2 m1 m2 =
   construct lambda
   where
@@ -896,11 +901,11 @@ zip2three m1 m2 m3 =
 --   >>> zipwith2 (^) c1 c2
 --   ((1),(32),(729))
 --
-zipwith2 :: Arity m
-           => (a -> a -> b)
-           -> Col m a
-           -> Col m a
-           -> Col m b
+zipwith2 :: (Arity m, Arity n)
+           => (a -> b -> c)
+           -> Mat m n a
+           -> Mat m n b
+           -> Mat m n c
 zipwith2 f c1 c2 =
   construct lambda
   where
@@ -951,6 +956,18 @@ ifoldl2 f initial (Mat rows) =
     row_function rowinit idx r = V.ifoldl (g idx) rowinit r
 
 
+-- | Left fold over the entries of a matrix (top-left to bottom-right).
+--
+foldl2 :: forall a b m n.
+          (b -> a -> b)
+        -> b
+        -> Mat m n a
+        -> b
+foldl2 f initial matrix =
+  -- Use the index fold but ignore the index arguments.
+  let g _ _ = f in ifoldl2 g initial matrix
+
+
 -- | Fold over the entire matrix passing the coordinates @i@ and @j@
 --   (of the row/column) to the accumulation function. The fold occurs
 --   from bottom-right to top-left.
@@ -1076,3 +1093,35 @@ inverse matrix =
   where
     lambda i j = cofactor matrix i j
 
+
+
+-- | Retrieve the rows of a matrix as a column matrix. If the given
+--   matrix is m-by-n, the result would be an m-by-1 column whose
+--   entries are 1-by-n row matrices.
+--
+--   Examples:
+--
+--   >>> let m = fromList [[1,2],[3,4]] :: Mat2 Int
+--   >>> (rows2 m) !!! (0,0)
+--   ((1,2))
+--   >>> (rows2 m) !!! (1,0)
+--   ((3,4))
+--
+rows2 :: (Arity m, Arity n)
+      => Mat m n a
+      -> Col m (Row n a)
+rows2 (Mat rows) =
+  Mat $ V.map (mk1. Mat . mk1) rows
+
+
+
+-- | Sum the elements of a matrix.
+--
+--   Examples:
+--
+--   >>> let m = fromList [[1,-1],[3,4]] :: Mat2 Int
+--   >>> element_sum2 m
+--   7
+--
+element_sum2 :: (Arity m, Arity n, Additive.C a) => Mat m n a -> a
+element_sum2 = foldl2 (+) zero