Clean up imports/exports.

Remove some unused functions.

diff --git a/src/Cardinal.hs b/src/Cardinal.hs
index ff410a8769fa304f935984e9f5a6fccabb1e9272..031dfc2c9c561ea4b3f5cbea51be284be8cbe123 100644 (file)
--- a/src/Cardinal.hs
+++ b/src/Cardinal.hs
@@ -15,7 +15,7 @@ where
 import Control.Monad (liftM, liftM2)
 import Prelude hiding (LT)
 
-import Test.HUnit
+import Test.HUnit (Assertion, assertEqual)
 import Test.Framework (Test, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.Framework.Providers.QuickCheck2 (testProperty)

diff --git a/src/Comparisons.hs b/src/Comparisons.hs
index d033159f23f827fa3776ca2c6dd2ac775780af91..3bf4e246bcfba473634b255fb1befb8187a84b8f 100644 (file)
--- a/src/Comparisons.hs
+++ b/src/Comparisons.hs
@@ -1,5 +1,14 @@
 -- | Functions for comparing 'Double' values.
-module Comparisons
+module Comparisons (
+  (~=),
+  (~~=),
+  almost_equals,
+  kinda_equals,
+  nearly_equals,
+  nearly_ge,
+  non_very_positive_entries,
+  very_positive,
+  )
 where
 
 -- | epsilon is the value that will be used in all tests that require

diff --git a/src/Examples.hs b/src/Examples.hs
index 0fc31c938b2c1a1186ede8f13591195bc1c27265..6300ce82460b2dde4e823f05f3400c9004cab09e 100644 (file)
--- a/src/Examples.hs
+++ b/src/Examples.hs
@@ -10,8 +10,8 @@ where
 
 import qualified Data.Array.Repa as Repa
 
-import Misc
-import Values
+import Misc (flatten, transpose_xz)
+import Values (Values3D)
 
 
 -- | Values of the function f(x,y,z) = 1 + x + xy + xyz taken at nine

diff --git a/src/Face.hs b/src/Face.hs
index 96848cd9f8c669b1045b40e45f1d0ee754e7e53c..96092609fc55f99cc86459ebf787f26594efff1f 100644 (file)
--- a/src/Face.hs
+++ b/src/Face.hs
@@ -1,6 +1,7 @@
 -- | The Face module just contains the definition of the 'Face' data
 --   type and its two typeclass instances.
 module Face
+  ( Face(..) )
 where
 
 import Point

diff --git a/src/FunctionValues.hs b/src/FunctionValues.hs
index ec8f35e28b271d36f8ed8277bcc733552cbc73a2..b1fede7a414af4af42f9eb374e798786ac2e4366 100644 (file)
--- a/src/FunctionValues.hs
+++ b/src/FunctionValues.hs
@@ -13,7 +13,7 @@ module FunctionValues (
 where
 
 import Prelude hiding (LT)
-import Test.HUnit
+import Test.HUnit (Assertion)
 import Test.Framework (Test, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.Framework.Providers.QuickCheck2 (testProperty)

diff --git a/src/Grid.hs b/src/Grid.hs
index 0131a64b8460ad42010346b4a87ae3a4d6482f99..ca66437a6bb13b73d591b68d1b16d3ead8d60c89 100644 (file)
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -11,7 +11,7 @@ module Grid (
 where
 
 import qualified Data.Array.Repa as R
-import Test.HUnit
+import Test.HUnit (Assertion, assertEqual)
 import Test.Framework (Test, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.Framework.Providers.QuickCheck2 (testProperty)
@@ -21,18 +21,18 @@ import Test.QuickCheck ((==>),
                         Positive(..),
                         Property,
                         choose)
-import Assertions
-import Comparisons
+import Assertions (assertAlmostEqual, assertClose, assertTrue)
+import Comparisons ((~=))
 import Cube (Cube(Cube),
              find_containing_tetrahedron,
              tetrahedra,
              tetrahedron)
-import Examples
-import FunctionValues
+import Examples (trilinear, trilinear9x9x9, zeros, naturals_1d)
+import FunctionValues (make_values, value_at)
 import Point (Point)
-import ScaleFactor
+import ScaleFactor (ScaleFactor)
 import Tetrahedron (Tetrahedron, c, polynomial, v0, v1, v2, v3)
-import ThreeDimensional
+import ThreeDimensional (ThreeDimensional(..))
 import Values (Values3D, dims, empty3d, zoom_shape)
 
 

diff --git a/src/Misc.hs b/src/Misc.hs
index 57dfd433e2ffc4b72cb8daa00f19f94443813404..b1cb1affcce0a53463c5f9ae400c5da27fabd157 100644 (file)
--- a/src/Misc.hs
+++ b/src/Misc.hs
@@ -7,7 +7,7 @@ import qualified Data.Vector as V (Vector, elem, empty, filter)
 import Test.Framework (Test, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.HUnit
+import Test.HUnit (Assertion, assertEqual)
 import Test.QuickCheck
 
 

diff --git a/src/Point.hs b/src/Point.hs
index 95b33640f4e81406f71a685c617a3c273a2a6284..4b9eaece2c88173c7a634899207d877730a99c41 100644 (file)
--- a/src/Point.hs
+++ b/src/Point.hs
@@ -1,9 +1,15 @@
 {-# LANGUAGE FlexibleInstances #-}
 
-module Point
+module Point (
+  Point,
+  distance,
+  dot,
+  is_close,
+  scale
+  )
 where
 
-import Comparisons
+import Comparisons ((~=))
 
 
 type Point = (Double, Double, Double)

diff --git a/src/RealFunction.hs b/src/RealFunction.hs
index cf98029a5f4948d71375ca0e8c188e19a2d39527..d461ae2f7d95fd1babe673d576c185bcee1e8de4 100644 (file)
--- a/src/RealFunction.hs
+++ b/src/RealFunction.hs
@@ -1,6 +1,10 @@
 {-# LANGUAGE FlexibleInstances #-}
 
-module RealFunction
+module RealFunction (
+  RealFunction,
+  cmult,
+  fexp
+  )
 where
 
 

diff --git a/src/ScaleFactor.hs b/src/ScaleFactor.hs
index 4af205644332f3a9fb4b205e3d7cbce893777d4d..9c5530f27911ab747745b8639ee8a47b73c0e711 100644 (file)
--- a/src/ScaleFactor.hs
+++ b/src/ScaleFactor.hs
@@ -1,6 +1,5 @@
 module ScaleFactor
+  (ScaleFactor)
 where
 
 type ScaleFactor = (Int, Int, Int)
-
---instance Integral ScaleFactor where

diff --git a/src/Tetrahedron.hs b/src/Tetrahedron.hs
index f3b53198362768b8fdbe83085cc55b8e6306b7cc..359ade5f115624aff8ee1030b0f4e347b1135f68 100644 (file)
--- a/src/Tetrahedron.hs
+++ b/src/Tetrahedron.hs
@@ -18,19 +18,18 @@ import qualified Data.Vector as V (
   sum
   )
 
-import Prelude hiding (LT)
 import Test.Framework (Test, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.HUnit
+import Test.HUnit (Assertion, assertEqual)
 import Test.QuickCheck (Arbitrary(..), Gen, Property, (==>))
 
 import Comparisons ((~=), nearly_ge)
 import FunctionValues (FunctionValues(..), empty_values)
 import Misc (factorial)
-import Point
-import RealFunction
-import ThreeDimensional
+import Point (Point, scale)
+import RealFunction (RealFunction, cmult, fexp)
+import ThreeDimensional (ThreeDimensional(..))
 
 data Tetrahedron =
   Tetrahedron { function_values :: FunctionValues,

diff --git a/src/ThreeDimensional.hs b/src/ThreeDimensional.hs
index 2775ee9c874d579f9b41837dde980abb6fab6935..4b74f184c9da86ee2faad7f82d56a02937820c7a 100644 (file)
--- a/src/ThreeDimensional.hs
+++ b/src/ThreeDimensional.hs
@@ -1,4 +1,5 @@
 module ThreeDimensional
+  ( ThreeDimensional(..) )
 where
 
 import Point(Point)

diff --git a/src/Values.hs b/src/Values.hs
index d7ede8399391b3229a1c7a6d36f04fececd3674b..a4720252bbe626ae70a52913822ed318665ffc08 100644 (file)
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,6 +1,15 @@
 {-# LANGUAGE FlexibleInstances #-}
 
-module Values
+module Values (
+  Values,
+  Values2D,
+  Values3D,
+  dims,
+  empty3d,
+  idx,
+  read_values_3d,
+  zoom_shape
+  )
 where
 
 import Data.Array.Repa (
@@ -13,17 +22,15 @@ import Data.Array.Repa (
   extent,
   fromList,
   unsafeIndex,
-  reshape,
-  size
+  reshape
   )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile,
-                                  writeVectorToTextFile)
+import Data.Array.Repa.IO.Vector (readVectorFromTextFile)
 import System.FilePath ()
 import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf)
 
 
-import ScaleFactor
+import ScaleFactor (ScaleFactor)
 
 
 type Values sh = Array sh Double
@@ -53,13 +60,6 @@ read_values_3d sh path = do
   one_d <- read_values_1d path
   return $ reshape sh one_d
 
-write_values_1d :: Values3D -> FilePath -> IO ()
-write_values_1d v3d path = do
-  let size3d = size $ extent v3d
-  let shape1d = (Z :. size3d)
-  let v1d = reshape shape1d v3d
-  writeVectorToTextFile v1d path
-
 empty3d :: Values3D
 empty3d = Data.Array.Repa.fromList (Z :. 0 :. 0 :. 0) []
 
@@ -87,8 +87,3 @@ zoom_shape (sfx, sfy, sfz) sh =
         z' = z * sfz
     in
       (Z :. x' :. y' :. z')
-
-
-drop_z :: DIM3 -> DIM2
-drop_z (Z :. 1 :. y :. x) = (Z :. y :. x)
-drop_z _ = error "can't drop the z-dimension unless its size is 1"