@@ -19,7 +19,7 @@ benchmark fromList swap methods = do
19
19
| (mode_str, (left, right)) <- [ (" disj_nn" , disj_nn), (" disj_ns" , disj_ns), (" disj_nt" , disj_nt)
20
20
, (" common_nn" , common_nn), (" common_ns" , common_ns), (" common_nt" , common_nt)
21
21
, (" mix_nn" , mix_nn), (" mix_ns" , mix_ns), (" mix_nt" , mix_nt)
22
- , (" block_nn" , block_nn), (" block_sn " , block_ns)
22
+ , (" block_nn" , block_nn), (" block_ns " , block_ns)
23
23
]
24
24
25
25
, (mode_str, left, right) <- replicate 2 (mode_str, left, right) ++
@@ -35,11 +35,11 @@ benchmark fromList swap methods = do
35
35
! common_nn = seqPair $ (all_n, fromList [2 ,4 .. n])
36
36
! common_ns = seqPair $ (all_n, fromList [0 ,1 + n`div` s.. n])
37
37
! common_nt = seqPair $ (all_n, fromList [0 ,1 + n`div` t.. n])
38
- ! mix_nn = seqPair $ fromLists $ partition ((= = 0 ) . (`mod` 2 )) [1 .. n+ n]
39
- ! mix_ns = seqPair $ fromLists $ partition ((= = 0 ) . (`mod` (1 + n`div` s))) [1 .. s+ n]
40
- ! mix_nt = seqPair $ fromLists $ partition ((= = 0 ) . (`mod` (1 + n`div` t))) [1 .. t+ n]
41
- ! block_nn = seqPair $ fromLists $ partition ((< t) . (`mod` (t * 2 ))) [1 .. n+ n]
42
- ! block_ns = seqPair $ fromLists $ partition ((< t) . (`mod` (t * (1 + n`div` s)))) [1 .. s+ n]
38
+ ! mix_nn = seqPair $ fromLists $ partition ((/ = 0 ) . (`mod` 2 )) [1 .. n+ n]
39
+ ! mix_ns = seqPair $ fromLists $ partition ((/ = 0 ) . (`mod` (1 + n`div` s))) [1 .. s+ n]
40
+ ! mix_nt = seqPair $ fromLists $ partition ((/ = 0 ) . (`mod` (1 + n`div` t))) [1 .. t+ n]
41
+ ! block_nn = seqPair $ fromLists $ partition ((>= t) . (`mod` (t * 2 ))) [1 .. n+ n]
42
+ ! block_ns = seqPair $ fromLists $ partition ((>= t) . (`mod` (t * (1 + n`div` s)))) [1 .. s+ n]
43
43
44
44
fromLists (xs, ys) = (fromList xs, fromList ys)
45
45
seqPair pair@ (xs, ys) = xs `seq` ys `seq` pair
0 commit comments