X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FGrid.hs;h=3cc316ae302771a7b80c12c8fdbca76fdcaba1a5;hb=e69710027d85a2d644d28e3e526330ad171d9983;hp=92ba20efbce2aa1c9f7bb843ec06806cb3e5d631;hpb=ac0e94e82605a5fd1e3ee724cd597f48614689e4;p=spline3.git

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index 92ba20e..3cc316a 100644
--- a/src/Tests/Grid.hs
+++ b/src/Tests/Grid.hs
@@ -1,7 +1,6 @@
 module Tests.Grid
 where
 
-import Data.Maybe (fromJust)
 import Test.HUnit
 
 import Assertions
@@ -23,7 +22,7 @@ test_trilinear_c0030 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -35,7 +34,7 @@ test_trilinear_c0003 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -47,7 +46,7 @@ test_trilinear_c0021 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -59,7 +58,7 @@ test_trilinear_c0012 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -71,7 +70,7 @@ test_trilinear_c0120 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -83,7 +82,7 @@ test_trilinear_c0102 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -95,7 +94,7 @@ test_trilinear_c0111 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -107,7 +106,7 @@ test_trilinear_c0210 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -119,7 +118,7 @@ test_trilinear_c0201 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -131,7 +130,7 @@ test_trilinear_c0300 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -143,7 +142,7 @@ test_trilinear_c1020 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -155,7 +154,7 @@ test_trilinear_c1002 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -167,7 +166,7 @@ test_trilinear_c1011 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -179,7 +178,7 @@ test_trilinear_c1110 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -191,7 +190,7 @@ test_trilinear_c1101 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -203,7 +202,7 @@ test_trilinear_c1200 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -215,7 +214,7 @@ test_trilinear_c2010 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -227,7 +226,7 @@ test_trilinear_c2001 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -239,7 +238,7 @@ test_trilinear_c2100 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -251,7 +250,7 @@ test_trilinear_c3000 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -263,7 +262,7 @@ test_trilinear_f0_t0_v0 =
     assertEqual "v0 is correct" (v0 t) (1, 1, 1)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -275,7 +274,7 @@ test_trilinear_f0_t0_v1 =
     assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -287,7 +286,7 @@ test_trilinear_f0_t0_v2 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -299,7 +298,7 @@ test_trilinear_f0_t0_v3 =
     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
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -317,7 +316,7 @@ test_trilinear_reproduced =
                       let k' = fromIntegral k]
     where
       g = make_grid 1 trilinear
-      c0 = fromJust $ cube_at g 1 1 1
+      c0 = cube_at g 1 1 1
 
 
 test_zeros_reproduced :: Assertion
@@ -332,7 +331,7 @@ test_zeros_reproduced =
                       let k' = fromIntegral k]
     where
       g = make_grid 1 zeros
-      c0 = fromJust $ cube_at g 1 1 1
+      c0 = cube_at g 1 1 1
       t0 = tetrahedron0 c0
       p = polynomial t0
 
@@ -352,7 +351,7 @@ test_trilinear9x9x9_reproduced =
               let k' = (fromIntegral k) * 0.5]
     where
       g = make_grid 1 trilinear
-      c0 = fromJust $ cube_at g 1 1 1
+      c0 = cube_at g 1 1 1
 
 
 -- | The point 'p' in this test lies on the boundary of tetrahedra 12 and 15.