From d6dd574714648c0703175b5b2d3ccdd5198bb552 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 15 Apr 2015 21:37:08 -0400 Subject: [PATCH] Import cleanup in Tetrahedron. --- src/Tetrahedron.hs | 68 ++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/src/Tetrahedron.hs b/src/Tetrahedron.hs index 0e2f902..8e9acd3 100644 --- a/src/Tetrahedron.hs +++ b/src/Tetrahedron.hs @@ -1,4 +1,5 @@ {-# LANGUAGE BangPatterns #-} + module Tetrahedron ( Tetrahedron(..), b0, -- Cube test @@ -10,27 +11,22 @@ module Tetrahedron ( polynomial, tetrahedron_properties, tetrahedron_tests, - volume -- Cube test - ) + volume ) -- Cube test where -import qualified Data.Vector as V ( - singleton, - snoc, - sum - ) - -import Test.Framework (Test, testGroup) -import Test.Framework.Providers.HUnit (testCase) -import Test.Framework.Providers.QuickCheck2 (testProperty) +import Data.Vector ( singleton, snoc ) +import qualified Data.Vector as V ( sum ) +import Test.Framework ( Test, testGroup ) +import Test.Framework.Providers.HUnit ( testCase ) +import Test.Framework.Providers.QuickCheck2 ( testProperty ) import Test.HUnit (Assertion, assertEqual) -import Test.QuickCheck (Arbitrary(..), Gen, Property, (==>)) +import Test.QuickCheck ( Arbitrary(..), Gen, Property, (==>) ) -import Comparisons ((~=)) -import FunctionValues (FunctionValues(..), empty_values) -import Misc (factorial) -import Point (Point(..), scale) -import RealFunction (RealFunction, cmult, fexp) +import Comparisons ( (~=) ) +import FunctionValues ( FunctionValues(..), empty_values ) +import Misc ( factorial ) +import Point ( Point(..), scale ) +import RealFunction ( RealFunction, cmult, fexp ) data Tetrahedron = Tetrahedron { function_values :: FunctionValues, @@ -78,25 +74,25 @@ barycenter (Tetrahedron _ v0' v1' v2' v3' _) = {-# INLINE polynomial #-} polynomial :: Tetrahedron -> (RealFunction Point) polynomial t = - V.sum $ V.singleton ((c t 0 0 0 3) `cmult` (beta t 0 0 0 3)) `V.snoc` - ((c t 0 0 1 2) `cmult` (beta t 0 0 1 2)) `V.snoc` - ((c t 0 0 2 1) `cmult` (beta t 0 0 2 1)) `V.snoc` - ((c t 0 0 3 0) `cmult` (beta t 0 0 3 0)) `V.snoc` - ((c t 0 1 0 2) `cmult` (beta t 0 1 0 2)) `V.snoc` - ((c t 0 1 1 1) `cmult` (beta t 0 1 1 1)) `V.snoc` - ((c t 0 1 2 0) `cmult` (beta t 0 1 2 0)) `V.snoc` - ((c t 0 2 0 1) `cmult` (beta t 0 2 0 1)) `V.snoc` - ((c t 0 2 1 0) `cmult` (beta t 0 2 1 0)) `V.snoc` - ((c t 0 3 0 0) `cmult` (beta t 0 3 0 0)) `V.snoc` - ((c t 1 0 0 2) `cmult` (beta t 1 0 0 2)) `V.snoc` - ((c t 1 0 1 1) `cmult` (beta t 1 0 1 1)) `V.snoc` - ((c t 1 0 2 0) `cmult` (beta t 1 0 2 0)) `V.snoc` - ((c t 1 1 0 1) `cmult` (beta t 1 1 0 1)) `V.snoc` - ((c t 1 1 1 0) `cmult` (beta t 1 1 1 0)) `V.snoc` - ((c t 1 2 0 0) `cmult` (beta t 1 2 0 0)) `V.snoc` - ((c t 2 0 0 1) `cmult` (beta t 2 0 0 1)) `V.snoc` - ((c t 2 0 1 0) `cmult` (beta t 2 0 1 0)) `V.snoc` - ((c t 2 1 0 0) `cmult` (beta t 2 1 0 0)) `V.snoc` + V.sum $ singleton ((c t 0 0 0 3) `cmult` (beta t 0 0 0 3)) `snoc` + ((c t 0 0 1 2) `cmult` (beta t 0 0 1 2)) `snoc` + ((c t 0 0 2 1) `cmult` (beta t 0 0 2 1)) `snoc` + ((c t 0 0 3 0) `cmult` (beta t 0 0 3 0)) `snoc` + ((c t 0 1 0 2) `cmult` (beta t 0 1 0 2)) `snoc` + ((c t 0 1 1 1) `cmult` (beta t 0 1 1 1)) `snoc` + ((c t 0 1 2 0) `cmult` (beta t 0 1 2 0)) `snoc` + ((c t 0 2 0 1) `cmult` (beta t 0 2 0 1)) `snoc` + ((c t 0 2 1 0) `cmult` (beta t 0 2 1 0)) `snoc` + ((c t 0 3 0 0) `cmult` (beta t 0 3 0 0)) `snoc` + ((c t 1 0 0 2) `cmult` (beta t 1 0 0 2)) `snoc` + ((c t 1 0 1 1) `cmult` (beta t 1 0 1 1)) `snoc` + ((c t 1 0 2 0) `cmult` (beta t 1 0 2 0)) `snoc` + ((c t 1 1 0 1) `cmult` (beta t 1 1 0 1)) `snoc` + ((c t 1 1 1 0) `cmult` (beta t 1 1 1 0)) `snoc` + ((c t 1 2 0 0) `cmult` (beta t 1 2 0 0)) `snoc` + ((c t 2 0 0 1) `cmult` (beta t 2 0 0 1)) `snoc` + ((c t 2 0 1 0) `cmult` (beta t 2 0 1 0)) `snoc` + ((c t 2 1 0 0) `cmult` (beta t 2 1 0 0)) `snoc` ((c t 3 0 0 0) `cmult` (beta t 3 0 0 0)) -- 2.44.2