Skip to content

Make Data.Map.fromDistinct{Asc,Desc}List eager #331

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 1 commit into from
Sep 4, 2016
Merged

Make Data.Map.fromDistinct{Asc,Desc}List eager #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions Data/Map/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3431,15 +3431,16 @@ fromDistinctAscList ((kx0, x0) : xs0) = go (1::Int) (Bin 1 kx0 x0 Tip Tip) xs0
where
go !_ t [] = t
go s l ((kx, x) : xs) = case create s xs of
(r, ys) -> go (s `shiftL` 1) (link kx x l r) ys
(r :*: ys) -> let !t' = link kx x l r
in go (s `shiftL` 1) t' ys

create !_ [] = (Tip, [])
create !_ [] = (Tip :*: [])
create s xs@(x' : xs')
| s == 1 = case x' of (kx, x) -> (Bin 1 kx x Tip Tip, xs')
| s == 1 = case x' of (kx, x) -> (Bin 1 kx x Tip Tip :*: xs')
| otherwise = case create (s `shiftR` 1) xs of
res@(_, []) -> res
(l, (ky, y):ys) -> case create (s `shiftR` 1) ys of
(r, zs) -> (link ky y l r, zs)
res@(_ :*: []) -> res
(l :*: (ky, y):ys) -> case create (s `shiftR` 1) ys of
(r :*: zs) -> (link ky y l r :*: zs)

-- | /O(n)/. Build a map from a descending list of distinct elements in linear time.
-- /The precondition is not checked./
Expand All @@ -3456,15 +3457,16 @@ fromDistinctDescList ((kx0, x0) : xs0) = go (1 :: Int) (Bin 1 kx0 x0 Tip Tip) xs
where
go !_ t [] = t
go s r ((kx, x) : xs) = case create s xs of
(l, ys) -> go (s `shiftL` 1) (link kx x l r) ys
(l :*: ys) -> let !t' = link kx x l r
in go (s `shiftL` 1) t' ys

create !_ [] = (Tip, [])
create !_ [] = (Tip :*: [])
create s xs@(x' : xs')
| s == 1 = case x' of (kx, x) -> (Bin 1 kx x Tip Tip, xs')
| s == 1 = case x' of (kx, x) -> (Bin 1 kx x Tip Tip :*: xs')
| otherwise = case create (s `shiftR` 1) xs of
res@(_, []) -> res
(r, (ky, y):ys) -> case create (s `shiftR` 1) ys of
(l, zs) -> (link ky y l r, zs)
res@(_ :*: []) -> res
(r :*: (ky, y):ys) -> case create (s `shiftR` 1) ys of
(l :*: zs) -> (link ky y l r :*: zs)

{-
-- Functions very similar to these were used to implement
Expand Down
32 changes: 18 additions & 14 deletions Data/Map/Strict/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1670,16 +1670,18 @@ fromDistinctAscList [] = Tip
fromDistinctAscList ((kx0, x0) : xs0) = x0 `seq` go (1::Int) (Bin 1 kx0 x0 Tip Tip) xs0
where
go !_ t [] = t
go s l ((kx, x) : xs) = case create s xs of
(r, ys) -> x `seq` go (s `shiftL` 1) (link kx x l r) ys
go s l ((kx, x) : xs) =
case create s xs of
(r :*: ys) -> x `seq` let !t' = link kx x l r
in go (s `shiftL` 1) t' ys

create !_ [] = (Tip, [])
create !_ [] = (Tip :*: [])
create s xs@(x' : xs')
| s == 1 = case x' of (kx, x) -> x `seq` (Bin 1 kx x Tip Tip, xs')
| s == 1 = case x' of (kx, x) -> x `seq` (Bin 1 kx x Tip Tip :*: xs')
| otherwise = case create (s `shiftR` 1) xs of
res@(_, []) -> res
(l, (ky, y):ys) -> case create (s `shiftR` 1) ys of
(r, zs) -> y `seq` (link ky y l r, zs)
res@(_ :*: []) -> res
(l :*: (ky, y):ys) -> case create (s `shiftR` 1) ys of
(r :*: zs) -> y `seq` (link ky y l r :*: zs)

-- | /O(n)/. Build a map from a descending list of distinct elements in linear time.
-- /The precondition is not checked./
Expand All @@ -1695,13 +1697,15 @@ fromDistinctDescList [] = Tip
fromDistinctDescList ((kx0, x0) : xs0) = x0 `seq` go (1::Int) (Bin 1 kx0 x0 Tip Tip) xs0
where
go !_ t [] = t
go s r ((kx, x) : xs) = case create s xs of
(l, ys) -> x `seq` go (s `shiftL` 1) (link kx x l r) ys
go s r ((kx, x) : xs) =
case create s xs of
(l :*: ys) -> x `seq` let !t' = link kx x l r
in go (s `shiftL` 1) t' ys

create !_ [] = (Tip, [])
create !_ [] = (Tip :*: [])
create s xs@(x' : xs')
| s == 1 = case x' of (kx, x) -> x `seq` (Bin 1 kx x Tip Tip, xs')
| s == 1 = case x' of (kx, x) -> x `seq` (Bin 1 kx x Tip Tip :*: xs')
| otherwise = case create (s `shiftR` 1) xs of
res@(_, []) -> res
(r, (ky, y):ys) -> case create (s `shiftR` 1) ys of
(l, zs) -> y `seq` (link ky y l r, zs)
res@(_ :*: []) -> res
(r :*: (ky, y):ys) -> case create (s `shiftR` 1) ys of
(l :*: zs) -> y `seq` (link ky y l r :*: zs)
6 changes: 4 additions & 2 deletions Data/Set/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,8 @@ fromDistinctAscList (x0 : xs0) = go (1::Int) (Bin 1 x0 Tip Tip) xs0
where
go !_ t [] = t
go s l (x : xs) = case create s xs of
(r :*: ys) -> go (s `shiftL` 1) (link x l r) ys
(r :*: ys) -> let !t' = link x l r
in go (s `shiftL` 1) t' ys

create !_ [] = (Tip :*: [])
create s xs@(x : xs')
Expand All @@ -995,7 +996,8 @@ fromDistinctDescList (x0 : xs0) = go (1::Int) (Bin 1 x0 Tip Tip) xs0
where
go !_ t [] = t
go s r (x : xs) = case create s xs of
(l :*: ys) -> go (s `shiftL` 1) (link x l r) ys
(l :*: ys) -> let !t' = link x l r
in go (s `shiftL` 1) t' ys

create !_ [] = (Tip :*: [])
create s xs@(x : xs')
Expand Down
2 changes: 2 additions & 0 deletions Utils/Containers/Internal/StrictPair.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ module Utils.Containers.Internal.StrictPair (StrictPair(..), toPair) where
-- @
data StrictPair a b = !a :*: !b

infixr 1 :*:

-- | Convert a strict pair to a standard pair.
toPair :: StrictPair a b -> (a, b)
toPair (x :*: y) = (x, y)
Expand Down