X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FIntegration%2FGaussian.hs;h=6eb46f6683a9c58d0105da1f1519d732c53bdd64;hb=6cefee6977791025aaa98dcd9996b1b378323c6c;hp=38214a0a5be7468b0b061e484ca0bb16d01556ff;hpb=b64e8d2a0ef24e880265b9ba4997c3d4eb995570;p=numerical-analysis.git diff --git a/src/Integration/Gaussian.hs b/src/Integration/Gaussian.hs index 38214a0..6eb46f6 100644 --- a/src/Integration/Gaussian.hs +++ b/src/Integration/Gaussian.hs @@ -24,13 +24,13 @@ import Linear.Matrix ( Col, Col10, Mat(..), - colzipwith, construct, fromList, identity_matrix, map2, - row', - transpose ) + row, + transpose, + zipwith2 ) import Linear.QR ( eigenvectors_symmetric ) import Normed ( Normed(..) ) @@ -119,7 +119,7 @@ nodes_and_weights iterations = nodes = shifted_nodes + ones -- unshift the nodes -- Get the first component of each column. - first_components = row' vecs 0 + first_components = row vecs 0 -- Square it and multiply by 2; see the Golub-Welsch paper for -- this magic. @@ -213,4 +213,4 @@ gaussian' f nodes weights = norm_p (1::Int) weighted_values where function_values = map2 f nodes - weighted_values = colzipwith (*) weights function_values + weighted_values = zipwith2 (*) weights function_values