From: Michael Orlitzky Date: Mon, 22 Aug 2011 17:57:56 +0000 (-0400) Subject: Rename "tetrahedrons" to "tetrahedra". X-Git-Tag: 0.0.1~242 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=f6d0c289ad3397cf392976c24f3afdb17da5d377;p=spline3.git Rename "tetrahedrons" to "tetrahedra". --- diff --git a/src/Cube.hs b/src/Cube.hs index 6941425..2878eb0 100644 --- a/src/Cube.hs +++ b/src/Cube.hs @@ -462,8 +462,8 @@ tetrahedron23 c = $ Tetrahedron.fv (tetrahedron0 c) -tetrahedrons :: Cube -> [Tetrahedron] -tetrahedrons c = +tetrahedra :: Cube -> [Tetrahedron] +tetrahedra c = [tetrahedron0 c, tetrahedron1 c, tetrahedron2 c, @@ -497,4 +497,4 @@ find_containing_tetrahedra c p = filter contains_our_point all_tetrahedra where contains_our_point = flip contains_point p - all_tetrahedra = tetrahedrons c + all_tetrahedra = tetrahedra c diff --git a/src/Tests/Cube.hs b/src/Tests/Cube.hs index 6d0f864..78e8e1a 100644 --- a/src/Tests/Cube.hs +++ b/src/Tests/Cube.hs @@ -16,14 +16,14 @@ import Tetrahedron (b0, b1, b2, b3, c, fv, -- Quickcheck tests. --- | Since the grid size is necessarily positive, all tetrahedrons +-- | Since the grid size is necessarily positive, all tetrahedra -- (which comprise cubes of positive volume) must have positive volume -- as well. prop_all_volumes_positive :: Cube -> Bool prop_all_volumes_positive cube = null nonpositive_volumes where - ts = tetrahedrons cube + ts = tetrahedra cube volumes = map volume ts nonpositive_volumes = filter (<= 0) volumes @@ -248,8 +248,8 @@ prop_tetrahedron23_volumes_exact cube = prop_v0_all_equal :: Cube -> Bool prop_v0_all_equal cube = (v0 t0) == (v0 t1) where - t0 = head (tetrahedrons cube) -- Doesn't matter which two we choose. - t1 = head $ tail (tetrahedrons cube) + t0 = head (tetrahedra cube) -- Doesn't matter which two we choose. + t1 = head $ tail (tetrahedra cube) -- | This pretty much repeats the prop_all_volumes_positive property, diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs index 5e51b19..6da0e09 100644 --- a/src/Tests/Grid.hs +++ b/src/Tests/Grid.hs @@ -308,7 +308,7 @@ test_trilinear_reproduced = | i <- [0..2], j <- [0..2], k <- [0..2], - t <- tetrahedrons c0, + t <- tetrahedra c0, let p = polynomial t, let i' = fromIntegral i, let j' = fromIntegral j,