X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FLinear%2FMatrix.hs;h=dd89a9ff3f091490c3d1587b2839c338ec495468;hb=4b7a8137a75e9fe186d1eb8976f7a47e82afc12b;hp=34920b4f025e7e2027588ab07c14d6772b679ab2;hpb=4e464a486bef07db44de9c3d3fae0c8094401b09;p=numerical-analysis.git

diff --git a/src/Linear/Matrix.hs b/src/Linear/Matrix.hs
index 34920b4..dd89a9f 100644
--- a/src/Linear/Matrix.hs
+++ b/src/Linear/Matrix.hs
@@ -91,6 +91,11 @@ type Col3 a = Col N3 a
 type Col4 a = Col N4 a
 type Col5 a = Col N5 a
 
+-- We need a big column for Gaussian quadrature.
+type N10 = S (S (S (S (S N5))))
+type Col10 a = Col N10 a
+
+
 instance (Eq a) => Eq (Mat m n a) where
   -- | Compare a row at a time.
   --
@@ -767,3 +772,54 @@ trace matrix =
   let (Mat rows) = diagonal matrix
   in
     element_sum $ V.map V.head rows
+
+
+-- | Zip together two column matrices.
+--
+--   Examples:
+--
+--   >>> let m1 = fromList [[1],[1],[1]] :: Col3 Int
+--   >>> let m2 = fromList [[1],[2],[3]] :: Col3 Int
+--   >>> colzip m1 m2
+--   (((1,1)),((1,2)),((1,3)))
+--
+colzip :: Arity m => Col m a -> Col m a -> Col m (a,a)
+colzip c1 c2 =
+  construct lambda
+  where
+    lambda i j = (c1 !!! (i,j), c2 !!! (i,j))
+
+
+-- | Zip together two column matrices using the supplied function.
+--
+--   Examples:
+--
+--   >>> let c1 = fromList [[1],[2],[3]] :: Col3 Integer
+--   >>> let c2 = fromList [[4],[5],[6]] :: Col3 Integer
+--   >>> colzipwith (^) c1 c2
+--   ((1),(32),(729))
+--
+colzipwith :: Arity m
+           => (a -> a -> b)
+           -> Col m a
+           -> Col m a
+           -> Col m b
+colzipwith f c1 c2 =
+  construct lambda
+  where
+    lambda i j = f (c1 !!! (i,j)) (c2 !!! (i,j))
+
+
+-- | Map a function over a matrix of any dimensions.
+--
+--   Examples:
+--
+--   >>> let m = fromList [[1,2],[3,4]] :: Mat2 Int
+--   >>> matmap (^2) m
+--   ((1,4),(9,16))
+--
+matmap :: (a -> b) -> Mat m n a -> Mat m n b
+matmap f (Mat rows) =
+  Mat $ V.map g rows
+  where
+    g = V.map f