X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FIntegration%2FSimpson.hs;h=6bfe258eb8e454b7a9dcc0c7221d4638eed3f61f;hb=613b25028368b3651bea0c801e05d9962ad9b604;hp=c3d59ff797c0538c377a08196065a63b43178003;hpb=29f7502f34bdd54dff446a3a886f0e24b7e44493;p=numerical-analysis.git diff --git a/src/Integration/Simpson.hs b/src/Integration/Simpson.hs index c3d59ff..6bfe258 100644 --- a/src/Integration/Simpson.hs +++ b/src/Integration/Simpson.hs @@ -6,10 +6,7 @@ where import Misc (partition) import NumericPrelude hiding (abs) -import Algebra.Absolute (abs) -import qualified Algebra.Field as Field import qualified Algebra.RealField as RealField -import qualified Algebra.RealRing as RealRing import qualified Algebra.ToInteger as ToInteger import qualified Algebra.ToRational as ToRational @@ -26,6 +23,7 @@ import qualified Algebra.ToRational as ToRational -- >>> simpson_1 f (-1) 1 -- 0.0 -- +-- >>> import Algebra.Absolute (abs) -- >>> let f x = x^2 -- >>> let area = simpson_1 f (-1) 1 -- >>> abs (area - (2/3)) < 1/10^12 @@ -47,7 +45,7 @@ simpson_1 :: (RealField.C a, ToRational.C a, RealField.C b) simpson_1 f a b = coefficient * ((f a) + 4*(f midpoint) + (f b)) where - coefficient = (fromRational' $ toRational (b - a)) / 6 + coefficient = fromRational' $ (toRational (b - a)) / 6 midpoint = (a + b) / 2 @@ -56,6 +54,7 @@ simpson_1 f a b = -- -- Examples: -- +-- >>> import Algebra.Absolute (abs) -- >>> let f x = x^4 -- >>> let area = simpson 10 f (-1) 1 -- >>> abs (area - (2/5)) < 0.0001 @@ -64,6 +63,7 @@ simpson_1 f a b = -- Note that the convergence here is much faster than the Trapezoid -- rule! -- +-- >>> import Algebra.Absolute (abs) -- >>> let area = simpson 10 sin 0 pi -- >>> abs (area - 2) < 0.00001 -- True