X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMisc.hs;h=e6cd07ea987cbfb38a621b2b10c6afe6f3d329e6;hb=a499efdb0e215ac424fe7c38a52430daebefc22b;hp=d0eb7286559ecd0b5098fd67afd38bcbb0179e1c;hpb=1bf996325008f79215a607d765adb042026f7444;p=spline3.git diff --git a/src/Misc.hs b/src/Misc.hs index d0eb728..e6cd07e 100644 --- a/src/Misc.hs +++ b/src/Misc.hs @@ -1,15 +1,22 @@ {-# LANGUAGE BangPatterns #-} + -- | The Misc module contains helper functions that seem out of place -- anywhere else. -module Misc +-- +module Misc ( + all_equal, + disjoint, + factorial, + flatten, + misc_properties, + misc_tests, + transpose_xz ) where -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 (Assertion, assertEqual) -import Test.QuickCheck +import qualified Data.Vector as V ( Vector, elem, empty, filter ) +import Test.Tasty ( TestTree, testGroup ) +import Test.Tasty.HUnit ( Assertion, assertEqual, testCase ) +import Test.Tasty.QuickCheck ( Property, (==>), testProperty ) -- | The standard factorial function. See @@ -64,11 +71,9 @@ transpose_xz m = -- Only used in tests. -- all_equal :: (Eq a) => [a] -> Bool -all_equal xs = - all (== first_element) other_elements - where - first_element = head xs - other_elements = tail xs +all_equal [] = True -- Vacuously +all_equal (x:xs) = all (== x) xs + -- | Returns 'True' if the vectors xs and ys are disjoint, 'False' @@ -109,13 +114,13 @@ test_flatten1 = actual_list = flatten target -misc_tests :: Test.Framework.Test +misc_tests :: TestTree misc_tests = - testGroup "Misc Tests" [ + testGroup "Misc tests" [ testCase "flatten (1)" test_flatten1 ] -misc_properties :: Test.Framework.Test +misc_properties :: TestTree misc_properties = - testGroup "Misc Properties" [ + testGroup "Misc properties" [ testProperty "factorial greater" prop_factorial_greater ]