Skip to content

Use a single fold for difference #64

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.

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

Merged
merged 2 commits into from
Oct 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ New features:
Bugfixes:

Other improvements:
- Speed up `difference` by using 1 fold instead of 2 (#64 by @JordanMartinez)

## [v3.0.0](https://github.com/purescript/purescript-ordered-collections/releases/tag/v3.0.0) - 2022-04-27

Expand Down
35 changes: 34 additions & 1 deletion bench/Bench/Data/Map.purs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ benchMap = do
log "---------------"
benchKeys

log "difference"
log "---------------"
benchDifference

where

benchUnion = do
Expand All @@ -61,7 +65,7 @@ benchMap = do
bigMap2' = M.fromFoldable $ natPairs2
size = Map2a0bff.size bigMap
size' = M.size bigMap'

log $ "Map2a0bff.union: big map (" <> show size <> ")"
benchWith 10 \_ -> Map2a0bff.union bigMap bigMap2

Expand Down Expand Up @@ -170,3 +174,32 @@ benchMap = do

log $ "fromFoldable (" <> show (L.length natPairs) <> ")"
benchWith 10 \_ -> M.fromFoldable natPairs

benchDifference = do
let nats = L.range 0 999999
natPairs = (flip Tuple) unit <$> nats
singletonMap = M.singleton 0 unit
smallMap = Map2a0bff.fromFoldable $ L.take 100 natPairs
smallMap' = M.fromFoldable $ L.take 100 natPairs
midMap = Map2a0bff.fromFoldable $ L.take 10000 natPairs
midMap' = M.fromFoldable $ L.take 10000 natPairs
bigMap = Map2a0bff.fromFoldable $ natPairs
bigMap' = M.fromFoldable $ natPairs

log $ "Map2a0bff.difference: small map (" <> show (Map2a0bff.size smallMap) <> ")"
bench \_ -> Map2a0bff.difference smallMap midMap

log $ "M.difference: small map (" <> show (M.size smallMap') <> ")"
bench \_ -> M.difference smallMap' midMap'

log $ "Map2a0bff.difference: midsize map (" <> show (Map2a0bff.size midMap) <> ")"
benchWith 100 \_ -> Map2a0bff.difference midMap midMap

log $ "M.difference: midsize map (" <> show (M.size midMap') <> ")"
benchWith 100 \_ -> M.difference midMap' midMap'

log $ "Map2a0bff.difference: big map (" <> show (Map2a0bff.size bigMap) <> ")"
benchWith 10 \_ -> Map2a0bff.difference bigMap midMap

log $ "M.difference: big map (" <> show (M.size bigMap') <> ")"
benchWith 10 \_ -> M.difference bigMap' midMap'
2 changes: 1 addition & 1 deletion src/Data/Map/Internal.purs
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ intersection = intersectionWith const
-- | Difference of two maps. Return elements of the first map where
-- | the keys do not exist in the second map.
difference :: forall k v w. Ord k => Map k v -> Map k w -> Map k v
difference m1 m2 = foldl (flip delete) m1 (keys m2)
difference m1 m2 = foldlWithIndex (\k m _ -> delete k m) m1 m2

-- | Test whether one map contains all of the keys and values contained in another map
isSubmap :: forall k v. Ord k => Eq v => Map k v -> Map k v -> Boolean
Expand Down