Use sumkv

haskell · Sep 11, 2024 · d2acc7c · d2acc7c
1 parent 868523b
commit d2acc7c
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/containers-tests/benchmarks/Map.hs b/containers-tests/benchmarks/Map.hs
@@ -71,7 +71,7 @@ main = do
         , bench "insertLookupWithKey' present" $ whnf (insLookupWithKey' elems_even) m_even
         , bench "mapWithKey" $ whnf (M.mapWithKey (+)) m
         , bench "foldlWithKey" $ whnf (ins elems) m
-        , bench "foldlWithKey'" $ whnf (M.foldlWithKey' sum 0) m
+        , bench "foldlWithKey'" $ whnf (M.foldlWithKey' sumkv 0) m
         , bench "foldrWithKey" $ whnf (M.foldrWithKey consPair []) m
         , bench "foldrWithKey'" $ whnf (M.foldrWithKey' consPair []) m
         , bench "update absent" $ whnf (upd Just evens) m_odd
@@ -90,13 +90,17 @@ main = do
         , bench "fromList" $ whnf M.fromList elems
         , bench "fromList-desc" $ whnf M.fromList elems_desc
         , bench "fromAscList" $ whnf M.fromAscList elems_asc
-        , bench "fromAscListWithKey" $ whnf (M.fromAscListWithKey (\k v2 v1 -> k + v2 + v1)) elems_asc
+        , bench "fromAscListWithKey" $
+            whnf (M.fromAscListWithKey sumkv) elems_asc
         , bench "fromDescList" $ whnf M.fromDescList elems_desc
-        , bench "fromDescListWithKey" $ whnf (M.fromDescListWithKey (\k v2 v1 -> k + v2 + v1)) elems_desc
+        , bench "fromDescListWithKey" $
+            whnf (M.fromDescListWithKey sumkv) elems_desc
         , bench "fromDistinctAscList" $ whnf M.fromDistinctAscList elems
-        , bench "fromDistinctAscList:fusion" $ whnf (\n -> M.fromDistinctAscList [(i,i) | i <- [1..n]]) bound
+        , bench "fromDistinctAscList:fusion" $
+            whnf (\n -> M.fromDistinctAscList [(i,i) | i <- [1..n]]) bound
         , bench "fromDistinctDescList" $ whnf M.fromDistinctDescList elems_rev
-        , bench "fromDistinctDescList:fusion" $ whnf (\n -> M.fromDistinctDescList [(i,i) | i <- [n,n-1..1]]) bound
+        , bench "fromDistinctDescList:fusion" $
+            whnf (\n -> M.fromDistinctDescList [(i,i) | i <- [n,n-1..1]]) bound
         , bench "minView" $ whnf (\m' -> case M.minViewWithKey m' of {Nothing -> 0; Just ((k,v),m'') -> k+v+M.size m''}) (M.fromAscList $ zip [1..10::Int] [100..110::Int])
         , bench "eq" $ whnf (\m' -> m' == m') m -- worst case, compares everything
         , bench "compare" $ whnf (\m' -> compare m' m') m -- worst case, compares everything
@@ -115,7 +119,7 @@ main = do
     evens = [2,4..bound]
     odds = [1,3..bound]
     values = [1..bound]
-    sum k v1 v2 = k + v1 + v2
+    sumkv k v1 v2 = k + v1 + v2
     consPair k v xs = (k, v) : xs
 
 add3 :: Int -> Int -> Int -> Int