X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMisc.hs;h=b1cb1affcce0a53463c5f9ae400c5da27fabd157;hb=3f7331f579118687cd73b977ce6aa7d401f88a09;hp=16b0ead151ad1b29190028db01aa98ef34d6b797;hpb=9849853e69c46b46996e8c775d15661b2aba27a8;p=spline3.git diff --git a/src/Misc.hs b/src/Misc.hs index 16b0ead..b1cb1af 100644 --- a/src/Misc.hs +++ b/src/Misc.hs @@ -3,11 +3,11 @@ 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 +import Test.HUnit (Assertion, assertEqual) import Test.QuickCheck @@ -66,22 +66,27 @@ 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 =