Switch to Tasty for testing.

[spline3.git] / src / Grid.hs

diff --git a/src/Grid.hs b/src/Grid.hs
index 269b37cec68d5c2f6211971dc1af32316b86c7ae..f9a59729554a9f12d72d9e384f332e024e858bdc 100644 (file)
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -3,40 +3,46 @@
 --   function used to build the interpolation.
 module Grid (
   cube_at,
+  grid_properties,
   grid_tests,
   slow_tests,
-  zoom
-  )
+  zoom )
 where
 
-import qualified Data.Array.Repa as R
-import qualified Data.Array.Repa.Operators.Traversal as R (unsafeTraverse)
-import Test.HUnit (Assertion, assertEqual)
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.QuickCheck ((==>),
-                        Arbitrary(..),
-                        Gen,
-                        Property,
-                        choose,
-                        vectorOf)
-import Assertions (assertAlmostEqual, assertTrue)
-import Comparisons ((~=))
-import Cube (Cube(Cube),
-             find_containing_tetrahedron,
-             tetrahedra,
-             tetrahedron)
-import Examples (trilinear, trilinear9x9x9, zeros)
-import FunctionValues (make_values, value_at)
-import Point (Point(..))
-import ScaleFactor (ScaleFactor)
+import Data.Array.Repa (
+  (:.)( (:.) ),
+  DIM3,
+  Z( Z ),
+  computeUnboxedP,
+  fromListUnboxed )
+import Data.Array.Repa.Operators.Traversal ( unsafeTraverse )
+import Test.Tasty ( TestTree, testGroup )
+import Test.Tasty.HUnit ( Assertion, assertEqual, testCase )
+import Test.Tasty.QuickCheck (
+  Arbitrary(..),
+  Gen,
+  Property,
+  (==>),
+  choose,
+  vectorOf,
+  testProperty )
+
+import Assertions ( assertAlmostEqual, assertTrue )
+import Comparisons ( (~=) )
+import Cube (
+  Cube( Cube ),
+  find_containing_tetrahedron,
+  tetrahedra,
+  tetrahedron )
+import Examples ( trilinear, trilinear9x9x9, zeros )
+import FunctionValues ( make_values, value_at )
+import Point ( Point(..) )
+import ScaleFactor ( ScaleFactor )
 import Tetrahedron (
-  Tetrahedron(v0,v1,v2,v3),
+  Tetrahedron( v0, v1, v2, v3 ),
   c,
-  polynomial,
-  )
-import Values (Values3D, dims, empty3d, zoom_shape)
+  polynomial )
+import Values ( Values3D, dims, empty3d, zoom_shape )
 
 
 -- | Our problem is defined on a Grid. The grid size is given by the
@@ -44,6 +50,7 @@ import Values (Values3D, dims, empty3d, zoom_shape)
 --   performance reasons (and simplicity). The function values are the
 --   values of the function at the grid points, which are distance h=1
 --   from one another in each direction (x,y,z).
+--
 data Grid = Grid { function_values :: Values3D }
           deriving (Show)
 
@@ -54,8 +61,8 @@ instance Arbitrary Grid where
       y_dim <- choose (1, 27)
       z_dim <- choose (1, 27)
       elements <- vectorOf (x_dim * y_dim * z_dim) (arbitrary :: Gen Double)
-      let new_shape = (R.Z R.:. x_dim R.:. y_dim R.:. z_dim)
-      let fvs = R.fromListUnboxed new_shape elements
+      let new_shape = (Z :. x_dim :. y_dim :. z_dim)
+      let fvs = fromListUnboxed new_shape elements
       return $ Grid fvs
 
 
@@ -104,13 +111,13 @@ find_containing_cube g (Point x y z) =
       k = calculate_containing_cube_coordinate g z
 
 
-zoom_lookup :: Values3D -> ScaleFactor -> a -> (R.DIM3 -> Double)
+zoom_lookup :: Values3D -> ScaleFactor -> a -> (DIM3 -> Double)
 zoom_lookup v3d scale_factor _ =
     zoom_result v3d scale_factor
 
 
-zoom_result :: Values3D -> ScaleFactor -> R.DIM3 -> Double
-zoom_result v3d (sfx, sfy, sfz) (R.Z R.:. m R.:. n R.:. o) =
+zoom_result :: Values3D -> ScaleFactor -> DIM3 -> Double
+zoom_result v3d (sfx, sfy, sfz) (Z :. m :. n :. o) =
   f p
   where
     g = Grid v3d
@@ -132,7 +139,7 @@ zoom :: Values3D -> ScaleFactor -> IO Values3D
 zoom v3d scale_factor
     | xsize == 0 || ysize == 0 || zsize == 0 = return empty3d
     | otherwise =
-        R.computeUnboxedP $ R.unsafeTraverse v3d transExtent f
+        computeUnboxedP $ unsafeTraverse v3d transExtent f
         where
           (xsize, ysize, zsize) = dims v3d
           transExtent = zoom_shape scale_factor
@@ -146,7 +153,7 @@ zoom v3d scale_factor
 --   We also verify that the four vertices on face0 of the cube are
 --   in the correct location.
 --
-trilinear_c0_t0_tests :: Test.Framework.Test
+trilinear_c0_t0_tests :: TestTree
 trilinear_c0_t0_tests =
   testGroup "trilinear c0 t0"
     [testGroup "coefficients"
@@ -456,9 +463,9 @@ prop_c0300_identity g =
 
 -- | All of the properties from Section (2.9), p. 80. These require a
 --   grid since they refer to two adjacent cubes.
-p80_29_properties :: Test.Framework.Test
+p80_29_properties :: TestTree
 p80_29_properties =
-  testGroup "p. 80, Section (2.9) Properties" [
+  testGroup "p. 80, Section (2.9) properties" [
     testProperty "c0120 identity" prop_c0120_identity,
     testProperty "c0111 identity" prop_c0111_identity,
     testProperty "c0201 identity" prop_c0201_identity,
@@ -467,19 +474,22 @@ p80_29_properties =
     testProperty "c0300 identity" prop_c0300_identity ]
 
 
-grid_tests :: Test.Framework.Test
+grid_tests :: TestTree
 grid_tests =
-    testGroup "Grid Tests" [
-      trilinear_c0_t0_tests,
-      p80_29_properties,
-      testProperty "cube indices within bounds"
-        prop_cube_indices_never_go_out_of_bounds ]
+  testGroup "Grid tests" [ trilinear_c0_t0_tests ]
 
 
+grid_properties :: TestTree
+grid_properties =
+  testGroup "Grid properties"
+    [ p80_29_properties,
+      testProperty "cube indices within bounds"
+                   prop_cube_indices_never_go_out_of_bounds ]
+
 -- Do the slow tests last so we can stop paying attention.
-slow_tests :: Test.Framework.Test
+slow_tests :: TestTree
 slow_tests =
-    testGroup "Slow Tests" [
+    testGroup "Slow tests" [
       testCase "trilinear reproduced" test_trilinear_reproduced,
       testCase "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced,
       testCase "zeros reproduced" test_zeros_reproduced ]