From c27b3d00fadd62a710668465722c58bb8087c418 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 24 Oct 2011 23:51:15 -0400 Subject: [PATCH] Add bang patterns to the FunctionValues module (Ben Lippmeier). --- src/FunctionValues.hs | 59 ++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/FunctionValues.hs b/src/FunctionValues.hs index b1fede7..6d98e95 100644 --- a/src/FunctionValues.hs +++ b/src/FunctionValues.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE BangPatterns #-} -- | The FunctionValues module contains the 'FunctionValues' type and -- the functions used to manipulate it. module FunctionValues ( @@ -29,33 +30,33 @@ import Values (Values3D, dims, idx) -- cube. Each value of f can be accessed by the name of its -- direction. data FunctionValues = - FunctionValues { front :: Double, - back :: Double, - left :: Double, - right :: Double, - top :: Double, - down :: Double, - front_left :: Double, - front_right :: Double, - front_down :: Double, - front_top :: Double, - back_left :: Double, - back_right :: Double, - back_down :: Double, - back_top :: Double, - left_down :: Double, - left_top :: Double, - right_down :: Double, - right_top :: Double, - front_left_down :: Double, - front_left_top :: Double, - front_right_down :: Double, - front_right_top :: Double, - back_left_down :: Double, - back_left_top :: Double, - back_right_down :: Double, - back_right_top :: Double, - interior :: Double } + FunctionValues { front :: !Double, + back :: !Double, + left :: !Double, + right :: !Double, + top :: !Double, + down :: !Double, + front_left :: !Double, + front_right :: !Double, + front_down :: !Double, + front_top :: !Double, + back_left :: !Double, + back_right :: !Double, + back_down :: !Double, + back_top :: !Double, + left_down :: !Double, + left_top :: !Double, + right_down :: !Double, + right_top :: !Double, + front_left_down :: !Double, + front_left_top :: !Double, + front_right_down :: !Double, + front_right_top :: !Double, + back_left_down :: !Double, + back_left_top :: !Double, + back_right_down :: !Double, + back_right_top :: !Double, + interior :: !Double } deriving (Eq, Show) @@ -200,7 +201,7 @@ eval f (Quotient x y) = (eval f x) / (eval f y) -- 5.0 -- value_at :: Values3D -> Int -> Int -> Int -> Double -value_at v3d i j k +value_at v3d !i !j !k -- Put the most common case first! | (valid_i i) && (valid_j j) && (valid_k k) = idx v3d i j k @@ -275,7 +276,7 @@ value_at v3d i j k -- coordinates (i,j,k), constructs and returns the 'FunctionValues' -- object centered at (i,j,k) make_values :: Values3D -> Int -> Int -> Int -> FunctionValues -make_values values i j k = +make_values values !i !j !k = empty_values { front = value_at values (i-1) j k, back = value_at values (i+1) j k, left = value_at values i (j-1) k, -- 2.43.2