Skip to content

Add unionWith #21

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

Merged
merged 4 commits into from
Dec 28, 2020
Merged

Add unionWith #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ee2bf0
Add unionWith
Zelenya Dec 23, 2020
32eddf7
Add unionWith
Zelenya Dec 23, 2020
a2b1d15
Add unionWith
Zelenya Dec 24, 2020
4ccd2df
Merge remote-tracking branch 'upstream/master' into patch-1
JordanMartinez Dec 28, 2020
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
7 changes: 7 additions & 0 deletions src/Foreign/Object.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module Foreign.Object
, keys
, values
, union
, unionWith
, unions
, isSubmap
, fold
Expand Down Expand Up @@ -262,6 +263,12 @@ values = toArrayWithKey (\_ v -> v)
union :: forall a. Object a -> Object a -> Object a
union m = mutate (\s -> foldM (\s' k v -> OST.poke k v s') s m)

-- | Compute the union of two maps, using the specified function
-- | to combine values for duplicate keys.
unionWith :: forall a. (a -> a -> a) -> Object a -> Object a -> Object a
unionWith f m1 m2 =
mutate (\s1 -> foldM (\s2 k v1 -> OST.poke k (runFn4 _lookup v1 (\v2 -> f v1 v2) k m2) s2) s1 m1) m2

-- | Compute the union of a collection of maps
unions :: forall f a. Foldable f => f (Object a) -> Object a
unions = foldl union empty
Expand Down
31 changes: 21 additions & 10 deletions test/Test/Foreign/Object.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import Prelude

import Control.Monad.Writer (runWriter, tell)
import Data.Array as A
import Data.Foldable (foldl, foldr)
import Data.Foldable (foldl, foldr, for_)
import Data.FoldableWithIndex (foldlWithIndex, foldrWithIndex, foldMapWithIndex)
import Data.Function (on)
import Data.List as L
import Data.List.NonEmpty as NEL
import Data.Maybe (Maybe(..))
import Data.Maybe (Maybe(..), fromMaybe)
import Data.Semigroup.First (First(..))
import Data.Semigroup.Last (Last(..))
import Data.Traversable (sequence, traverse)
Expand Down Expand Up @@ -181,15 +181,26 @@ objectTests = do
L.groupBy ((==) `on` fst) <<< L.sortBy (compare `on` fst) in
O.fromFoldableWith (<>) arr == f (arr :: L.List (Tuple String String)) <?> show arr

log "Lookup from union"
quickCheck $ \(TestObject m1) (TestObject m2) k ->
O.lookup k (O.union m1 m2) == (case O.lookup k m1 of
Nothing -> O.lookup k m2
Just v -> Just (number v)) <?> ("m1: " <> show m1 <> ", m2: " <> show m2 <> ", k: " <> show k <> ", v1: " <> show (O.lookup k m1) <> ", v2: " <> show (O.lookup k m2) <> ", union: " <> show (O.union m1 m2))
log "unionWith"
for_ [Tuple (+) 0, Tuple (*) 1] $ \(Tuple op ident) ->
quickCheck $ \(TestObject m1) (TestObject m2) k ->
let u = O.unionWith op m1 m2 :: O.Object Int
in case O.lookup k u of
Nothing -> not (O.member k m1 || O.member k m2)
Just v -> v == op (fromMaybe ident (O.lookup k m1)) (fromMaybe ident (O.lookup k m2))

log "Union is idempotent"
quickCheck $ \(TestObject m1) (TestObject m2) ->
(m1 `O.union` m2) == ((m1 `O.union` m2) `O.union` (m2 :: O.Object Int)) <?> (show (O.size (m1 `O.union` m2)) <> " != " <> show (O.size ((m1 `O.union` m2) `O.union` m2)))
log "unionWith argument order"
quickCheck $ \(TestObject m1) (TestObject m2) k ->
let u = O.unionWith (-) m1 m2 :: O.Object Int
in1 = O.member k m1
v1 = O.lookup k m1
in2 = O.member k m2
v2 = O.lookup k m2
in case O.lookup k u of
Just v | in1 && in2 -> Just v == ((-) <$> v1 <*> v2)
Just v | in1 -> Just v == v1
Just v -> Just v == v2
Nothing -> not (in1 || in2)

log "fromFoldable = zip keys values"
quickCheck $ \(TestObject m) -> O.toUnfoldable m == A.zipWith Tuple (O.keys m) (O.values m :: Array Int)
Expand Down