X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMisc.hs;h=b1cb1affcce0a53463c5f9ae400c5da27fabd157;hb=3f7331f579118687cd73b977ce6aa7d401f88a09;hp=b9220cbbcefa7bf52ea9ec6c76b5f5d09467d4b6;hpb=42e5b4cc8b2dbd76ba4567b73967de974831c666;p=spline3.git

diff --git a/src/Misc.hs b/src/Misc.hs
index b9220cb..b1cb1af 100644
--- a/src/Misc.hs
+++ b/src/Misc.hs
@@ -3,7 +3,12 @@
 module Misc
 where
 
-import Data.List (intersect)
+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
 
 
 -- | The standard factorial function. See
@@ -61,17 +66,49 @@ all_equal xs =
       other_elements = tail xs
 
 
--- | Returns 'True' if the lists xs and ys are disjoint, 'False'
+-- | Returns 'True' if the vectors xs and ys are disjoint, 'False'
 --   otherwise.
 --
 --   Examples:
 --
---   >>> disjoint [1,2,3] [4,5,6]
+--   >>> let xs = Data.Vector.fromList [1,2,3]
+--   >>> let ys = Data.Vector.fromList [4,5,6]
+--   >>> disjoint xs ys
 --   True
 --
---   >>>  disjoint [1,2,3] [3,4,5]
+--   >>> let ys = Data.Vector.fromList [3,4,5]
+--   >>> disjoint xs ys
 --   False
 --
-disjoint :: (Eq a) => [a] -> [a] -> Bool
+disjoint :: (Eq a) => V.Vector a -> V.Vector a -> Bool
 disjoint xs ys =
-    intersect xs ys == []
+  intersect xs ys == V.empty
+  where
+    intersect :: (Eq a) => V.Vector a -> V.Vector a -> V.Vector a
+    intersect ws zs =
+      V.filter (`V.elem` zs) ws
+
+prop_factorial_greater :: Int -> Property
+prop_factorial_greater n =
+    n <= 20 ==> factorial n >= n
+
+
+test_flatten1 :: Assertion
+test_flatten1 =
+    assertEqual "flatten actually works" expected_list actual_list
+    where
+      target = [[[1::Int]], [[2, 3]]]
+      expected_list = [1, 2, 3]
+      actual_list = flatten target
+
+
+misc_tests :: Test.Framework.Test
+misc_tests =
+    testGroup "Misc Tests" [
+      testCase "flatten (1)" test_flatten1 ]
+
+
+misc_properties :: Test.Framework.Test
+misc_properties =
+    testGroup "Misc Properties" [
+      testProperty "factorial greater" prop_factorial_greater ]