X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FGrid.hs;h=750cff81a3d1156000b6b8f78543d7c6451d54e7;hb=a2cc10f44d77965b97c21ba74aa2acb302cd8fe0;hp=e6bd8d0542058a9aef5f3ae20a40b251e7b59691;hpb=7c648d2c1ca966c4ba1dfff08a13100f065d5dbf;p=spline3.git

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index e6bd8d0..750cff8 100644
--- a/src/Tests/Grid.hs
+++ b/src/Tests/Grid.hs
@@ -24,9 +24,9 @@ instance Arbitrary Grid where
 -- | Check the value of c0030 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0030 :: Test
+test_trilinear_c0030 :: Assertion
 test_trilinear_c0030 =
-    TestCase $ assertAlmostEqual "c0030 is correct" (c t 0 0 3 0) (17/8)
+    assertAlmostEqual "c0030 is correct" (c t 0 0 3 0) (17/8)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -36,9 +36,9 @@ test_trilinear_c0030 =
 -- | Check the value of c0003 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0003 :: Test
+test_trilinear_c0003 :: Assertion
 test_trilinear_c0003 =
-    TestCase $ assertAlmostEqual "c0003 is correct" (c t 0 0 0 3) (27/8)
+    assertAlmostEqual "c0003 is correct" (c t 0 0 0 3) (27/8)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -48,9 +48,9 @@ test_trilinear_c0003 =
 -- | Check the value of c0021 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0021 :: Test
+test_trilinear_c0021 :: Assertion
 test_trilinear_c0021 =
-    TestCase $ assertAlmostEqual "c0021 is correct" (c t 0 0 2 1) (61/24)
+    assertAlmostEqual "c0021 is correct" (c t 0 0 2 1) (61/24)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -60,9 +60,9 @@ test_trilinear_c0021 =
 -- | Check the value of c0012 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0012 :: Test
+test_trilinear_c0012 :: Assertion
 test_trilinear_c0012 =
-    TestCase $ assertAlmostEqual "c0012 is correct" (c t 0 0 1 2) (71/24)
+    assertAlmostEqual "c0012 is correct" (c t 0 0 1 2) (71/24)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -72,9 +72,9 @@ test_trilinear_c0012 =
 -- | Check the value of c0120 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0120 :: Test
+test_trilinear_c0120 :: Assertion
 test_trilinear_c0120 =
-    TestCase $ assertAlmostEqual "c0120 is correct" (c t 0 1 2 0) (55/24)
+    assertAlmostEqual "c0120 is correct" (c t 0 1 2 0) (55/24)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -84,9 +84,9 @@ test_trilinear_c0120 =
 -- | Check the value of c0102 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0102 :: Test
+test_trilinear_c0102 :: Assertion
 test_trilinear_c0102 =
-    TestCase $ assertAlmostEqual "c0102 is correct" (c t 0 1 0 2) (73/24)
+    assertAlmostEqual "c0102 is correct" (c t 0 1 0 2) (73/24)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -96,9 +96,9 @@ test_trilinear_c0102 =
 -- | Check the value of c0111 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0111 :: Test
+test_trilinear_c0111 :: Assertion
 test_trilinear_c0111 =
-    TestCase $ assertAlmostEqual "c0111 is correct" (c t 0 1 1 1) (8/3)
+    assertAlmostEqual "c0111 is correct" (c t 0 1 1 1) (8/3)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -108,9 +108,9 @@ test_trilinear_c0111 =
 -- | Check the value of c0210 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0210 :: Test
+test_trilinear_c0210 :: Assertion
 test_trilinear_c0210 =
-    TestCase $ assertAlmostEqual "c0210 is correct" (c t 0 2 1 0) (29/12)
+    assertAlmostEqual "c0210 is correct" (c t 0 2 1 0) (29/12)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -120,9 +120,9 @@ test_trilinear_c0210 =
 -- | Check the value of c0201 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0201 :: Test
+test_trilinear_c0201 :: Assertion
 test_trilinear_c0201 =
-    TestCase $ assertAlmostEqual "c0201 is correct" (c t 0 2 0 1) (11/4)
+    assertAlmostEqual "c0201 is correct" (c t 0 2 0 1) (11/4)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -132,9 +132,9 @@ test_trilinear_c0201 =
 -- | Check the value of c0300 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c0300 :: Test
+test_trilinear_c0300 :: Assertion
 test_trilinear_c0300 =
-    TestCase $ assertAlmostEqual "c0300 is correct" (c t 0 3 0 0) (5/2)
+    assertAlmostEqual "c0300 is correct" (c t 0 3 0 0) (5/2)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -144,9 +144,9 @@ test_trilinear_c0300 =
 -- | Check the value of c1020 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1020 :: Test
+test_trilinear_c1020 :: Assertion
 test_trilinear_c1020 =
-    TestCase $ assertAlmostEqual "c1020 is correct" (c t 1 0 2 0) (8/3)
+    assertAlmostEqual "c1020 is correct" (c t 1 0 2 0) (8/3)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -156,9 +156,9 @@ test_trilinear_c1020 =
 -- | Check the value of c1002 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1002 :: Test
+test_trilinear_c1002 :: Assertion
 test_trilinear_c1002 =
-    TestCase $ assertAlmostEqual "c1002 is correct" (c t 1 0 0 2) (23/6)
+    assertAlmostEqual "c1002 is correct" (c t 1 0 0 2) (23/6)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -168,9 +168,9 @@ test_trilinear_c1002 =
 -- | Check the value of c1011 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1011 :: Test
+test_trilinear_c1011 :: Assertion
 test_trilinear_c1011 =
-    TestCase $ assertAlmostEqual "c1011 is correct" (c t 1 0 1 1) (13/4)
+    assertAlmostEqual "c1011 is correct" (c t 1 0 1 1) (13/4)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -180,9 +180,9 @@ test_trilinear_c1011 =
 -- | Check the value of c1110 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1110 :: Test
+test_trilinear_c1110 :: Assertion
 test_trilinear_c1110 =
-    TestCase $ assertAlmostEqual "c1110 is correct" (c t 1 1 1 0) (23/8)
+    assertAlmostEqual "c1110 is correct" (c t 1 1 1 0) (23/8)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -192,9 +192,9 @@ test_trilinear_c1110 =
 -- | Check the value of c1101 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1101 :: Test
+test_trilinear_c1101 :: Assertion
 test_trilinear_c1101 =
-    TestCase $ assertAlmostEqual "c1101 is correct" (c t 1 1 0 1) (27/8)
+    assertAlmostEqual "c1101 is correct" (c t 1 1 0 1) (27/8)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -204,9 +204,9 @@ test_trilinear_c1101 =
 -- | Check the value of c1200 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c1200 :: Test
+test_trilinear_c1200 :: Assertion
 test_trilinear_c1200 =
-    TestCase $ assertAlmostEqual "c1200 is correct" (c t 1 2 0 0) 3
+    assertAlmostEqual "c1200 is correct" (c t 1 2 0 0) 3
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -216,9 +216,9 @@ test_trilinear_c1200 =
 -- | Check the value of c2010 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c2010 :: Test
+test_trilinear_c2010 :: Assertion
 test_trilinear_c2010 =
-    TestCase $ assertAlmostEqual "c2010 is correct" (c t 2 0 1 0) (10/3)
+    assertAlmostEqual "c2010 is correct" (c t 2 0 1 0) (10/3)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -228,9 +228,9 @@ test_trilinear_c2010 =
 -- | Check the value of c2001 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c2001 :: Test
+test_trilinear_c2001 :: Assertion
 test_trilinear_c2001 =
-    TestCase $ assertAlmostEqual "c2001 is correct" (c t 2 0 0 1) 4
+    assertAlmostEqual "c2001 is correct" (c t 2 0 0 1) 4
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -240,9 +240,9 @@ test_trilinear_c2001 =
 -- | Check the value of c2100 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c2100 :: Test
+test_trilinear_c2100 :: Assertion
 test_trilinear_c2100 =
-    TestCase $ assertAlmostEqual "c2100 is correct" (c t 2 1 0 0) (7/2)
+    assertAlmostEqual "c2100 is correct" (c t 2 1 0 0) (7/2)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -252,9 +252,9 @@ test_trilinear_c2100 =
 -- | Check the value of c3000 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
-test_trilinear_c3000 :: Test
+test_trilinear_c3000 :: Assertion
 test_trilinear_c3000 =
-    TestCase $ assertAlmostEqual "c3000 is correct" (c t 3 0 0 0) 4
+    assertAlmostEqual "c3000 is correct" (c t 3 0 0 0) 4
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -264,9 +264,9 @@ test_trilinear_c3000 =
 -- | Make sure that v0 of tetrahedron0 belonging to the cube centered
 --   on (1,1,1) with a grid constructed from the trilinear values
 --   winds up in the right place. See example one in the paper.
-test_trilinear_f0_t0_v0 :: Test
+test_trilinear_f0_t0_v0 :: Assertion
 test_trilinear_f0_t0_v0 =
-    TestCase $ assertEqual "v0 is correct" (v0 t) (1, 1, 1)
+    assertEqual "v0 is correct" (v0 t) (1, 1, 1)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -276,9 +276,9 @@ test_trilinear_f0_t0_v0 =
 -- | Make sure that v1 of tetrahedron0 belonging to the cube centered
 --   on (1,1,1) with a grid constructed from the trilinear values
 --   winds up in the right place. See example one in the paper.
-test_trilinear_f0_t0_v1 :: Test
+test_trilinear_f0_t0_v1 :: Assertion
 test_trilinear_f0_t0_v1 =
-    TestCase $ assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
+    assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -288,9 +288,9 @@ test_trilinear_f0_t0_v1 =
 -- | Make sure that v2 of tetrahedron0 belonging to the cube centered
 --   on (1,1,1) with a grid constructed from the trilinear values
 --   winds up in the right place. See example one in the paper.
-test_trilinear_f0_t0_v2 :: Test
+test_trilinear_f0_t0_v2 :: Assertion
 test_trilinear_f0_t0_v2 =
-    TestCase $ assertEqual "v2 is correct" (v2 t) (0.5, 0.5, 1.5)
+    assertEqual "v2 is correct" (v2 t) (0.5, 0.5, 1.5)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
@@ -300,18 +300,18 @@ test_trilinear_f0_t0_v2 =
 -- | Make sure that v3 of tetrahedron0 belonging to the cube centered
 --   on (1,1,1) with a grid constructed from the trilinear values
 --   winds up in the right place. See example one in the paper.
-test_trilinear_f0_t0_v3 :: Test
+test_trilinear_f0_t0_v3 :: Assertion
 test_trilinear_f0_t0_v3 =
-    TestCase $ assertClose "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
+    assertClose "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
       where
         g = make_grid 1 trilinear
         cube = fromJust $ cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
-test_trilinear_reproduced :: Test
+test_trilinear_reproduced :: Assertion
 test_trilinear_reproduced =
-    TestCase $ assertTrue "trilinears are reproduced correctly" $
+    assertTrue "trilinears are reproduced correctly" $
              and [p (i', j', k') ~= value_at trilinear i j k
                     | i <- [0..2],
                       j <- [0..2],
@@ -326,9 +326,9 @@ test_trilinear_reproduced =
       p = polynomial t0
 
 
-test_zeros_reproduced :: Test
+test_zeros_reproduced :: Assertion
 test_zeros_reproduced =
-    TestCase $ assertTrue "the zero function is reproduced correctly" $
+    assertTrue "the zero function is reproduced correctly" $
              and [p (i', j', k') ~= value_at zeros i j k
                     | i <- [0..2],
                       j <- [0..2],
@@ -341,34 +341,3 @@ test_zeros_reproduced =
       c0 = fromJust $ cube_at g 1 1 1
       t0 = tetrahedron0 c0
       p = polynomial t0
-
-
--- | A list of all HUnit tests defined in this module.
-grid_tests :: [Test]
-grid_tests =
-    [test_trilinear_c0030,
-     test_trilinear_c0003,
-     test_trilinear_c0021,
-     test_trilinear_c0012,
-     test_trilinear_c0120,
-     test_trilinear_c0102,
-     test_trilinear_c0111,
-     test_trilinear_c0210,
-     test_trilinear_c0201,
-     test_trilinear_c0300,
-     test_trilinear_c1020,
-     test_trilinear_c1002,
-     test_trilinear_c1011,
-     test_trilinear_c1110,
-     test_trilinear_c1101,
-     test_trilinear_c1200,
-     test_trilinear_c2010,
-     test_trilinear_c2001,
-     test_trilinear_c2100,
-     test_trilinear_c3000,
-     test_trilinear_f0_t0_v0,
-     test_trilinear_f0_t0_v1,
-     test_trilinear_f0_t0_v2,
-     test_trilinear_f0_t0_v3,
-     test_trilinear_reproduced,
-     test_zeros_reproduced]