X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTetrahedron.hs;h=4bc86581bf0491cf7d8a66bfbcf7f019b66aa3b7;hb=f10cdab8ffeb93b3d36fe8140321c8a94ceb4825;hp=e63f96b7d1bc750e4c18c08888a5bf95ecc2f049;hpb=a499efdb0e215ac424fe7c38a52430daebefc22b;p=spline3.git diff --git a/src/Tetrahedron.hs b/src/Tetrahedron.hs index e63f96b..4bc8658 100644 --- a/src/Tetrahedron.hs +++ b/src/Tetrahedron.hs @@ -19,7 +19,7 @@ import qualified Data.Vector as V ( sum ) import Test.Tasty ( TestTree, testGroup ) import Test.Tasty.HUnit ( Assertion, assertEqual, testCase ) import Test.Tasty.QuickCheck ( - Arbitrary(..), + Arbitrary( arbitrary ), Gen, Property, (==>), @@ -28,7 +28,7 @@ import Test.Tasty.QuickCheck ( import Comparisons ( (~=) ) import FunctionValues ( FunctionValues(..), empty_values ) import Misc ( factorial ) -import Point ( Point(..), scale ) +import Point ( Point(Point), scale ) import RealFunction ( RealFunction, cmult, fexp ) data Tetrahedron = @@ -107,7 +107,7 @@ beta t i j k l = coefficient `cmult` (b0_term * b1_term * b2_term * b3_term) where denominator = (factorial i)*(factorial j)*(factorial k)*(factorial l) - coefficient = 6 / (fromIntegral denominator) + coefficient = (6 / (fromIntegral denominator)) :: Double b0_term = (b0 t) `fexp` i b1_term = (b1 t) `fexp` j b2_term = (b2 t) `fexp` k