Skip to content

Larger keys for intmap and intset #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Larger keys for intmap and intset #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a81b8ba
use larger keys for IntMaps
jwaldmann Jul 22, 2021
d458ed8
use larger elements for IntSets
jwaldmann Jul 22, 2021
227f09f
generate more test cases
jwaldmann Jul 22, 2021
b7d5814
run fewer tests (and try to un-freeze current CI batch)
Jul 22, 2021
5f04ab9
up the number again
Jul 22, 2021
efb6dbf
well, binary search ...
Jul 22, 2021
3d5e6b7
test-options in the style of tasty
jwaldmann Mar 11, 2022
ae54f24
OK, no time-out then, to see how much time CI needs here
jwaldmann Mar 11, 2022
ca80bbf
use several num/size combinations
jwaldmann Mar 11, 2022
cba497d
try to select subset of tests
jwaldmann Mar 12, 2022
b74aea4
syntax
jwaldmann Mar 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,12 @@ jobs:
- name: tests
run: |
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intset --quickcheck-tests=10000"
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intset --quickcheck-tests=1000 --quickcheck-max-size=100"
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intset --quickcheck-tests=10 --quickcheck-max-size=1000"
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intmap --quickcheck-tests=10000"
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intmap --quickcheck-tests=1000 --quickcheck-max-size=100"
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct --test-options="--pattern=intmap --quickcheck-tests=10 --quickcheck-max-size=1000"
- name: haddock
run: |
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
Expand Down
6 changes: 3 additions & 3 deletions containers-tests/tests/intmap-properties.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,16 +219,16 @@ apply3 f a b c = apply f (a, b, c)


{--------------------------------------------------------------------
Arbitrary, reasonably balanced trees
Arbitrary IntMaps, including those with large keys
--------------------------------------------------------------------}

instance Arbitrary a => Arbitrary (IntMap a) where
arbitrary = fmap fromList arbitrary
arbitrary = fmap (fromList . fmap (\(k,v) -> (getLarge k, v))) arbitrary

newtype NonEmptyIntMap a = NonEmptyIntMap {getNonEmptyIntMap :: IntMap a} deriving (Eq, Show)

instance Arbitrary a => Arbitrary (NonEmptyIntMap a) where
arbitrary = fmap (NonEmptyIntMap . fromList . getNonEmpty) arbitrary
arbitrary = fmap (NonEmptyIntMap . fromList . fmap (\(k,v) -> (getLarge k, v)) . getNonEmpty) arbitrary


------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions containers-tests/tests/intset-properties.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ test_split = do
split 3 (fromList [1..5]) @?= (fromList [1,2], fromList [4,5])

{--------------------------------------------------------------------
Arbitrary, reasonably balanced trees
Arbitrary IntSets, including those with large elements
--------------------------------------------------------------------}
instance Arbitrary IntSet where
arbitrary = do{ xs <- arbitrary
; return (fromList xs)
; return (fromList (fmap getLarge xs))
}

{--------------------------------------------------------------------
Expand Down