Skip to content

Idea for 0 and negative values. #10

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

Open
vwwv wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Idea for 0 and negative values. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b0e583
Create README.md
vwwv Jan 18, 2016
7733879
remove README.md
vwwv Jan 18, 2016
9104de4
Data.MultiSet to handle 0 and negative values
vwwv Jan 18, 2016
5a09e55
Data.IntMultiSet to handle 0 and negative values
vwwv Jan 18, 2016
badf3ae
Non positive occurrences are silently filtered.
vwwv Jan 21, 2016
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
6 changes: 3 additions & 3 deletions Data/IntMultiSet.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,17 +562,17 @@ toAscOccurList = Map.toAscList . unMS

-- | /O(n*min(n,W))/. Create a multiset from a list of element\/occurence pairs.
fromOccurList :: [(Int,Int)] -> IntMultiSet
fromOccurList = MS . Map.fromListWith (+)
fromOccurList = MS . Map.filter (>0) . Map.fromListWith (+)

-- | /O(n)/. Build a multiset from an ascending list of element\/occurence pairs in linear time.
-- /The precondition (input list is ascending) is not checked./
fromAscOccurList :: [(Int,Int)] -> IntMultiSet
fromAscOccurList = MS . Map.fromAscListWith (+)
fromAscOccurList = MS . Map.filter (>0) . Map.fromAscListWith (+)

-- | /O(n)/. Build a multiset from an ascending list of elements\/occurence pairs where each elements appears only once.
-- /The precondition (input list is strictly ascending) is not checked./
fromDistinctAscOccurList :: [(Int,Int)] -> IntMultiSet
fromDistinctAscOccurList = MS . Map.fromDistinctAscList
fromDistinctAscOccurList = MS . Map.filter (>0) . Map.fromDistinctAscList

{--------------------------------------------------------------------
Map
Expand Down
6 changes: 3 additions & 3 deletions Data/MultiSet.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,17 +556,17 @@ toAscOccurList = Map.toAscList . unMS

-- | /O(n*log n)/. Create a multiset from a list of element\/occurence pairs.
fromOccurList :: Ord a => [(a,Occur)] -> MultiSet a
fromOccurList = MS . Map.fromListWith (+)
fromOccurList = MS . Map.filter (>0) . Map.fromListWith (+)

-- | /O(n)/. Build a multiset from an ascending list of element\/occurence pairs in linear time.
-- /The precondition (input list is ascending) is not checked./
fromAscOccurList :: Eq a => [(a,Occur)] -> MultiSet a
fromAscOccurList = MS . Map.fromAscListWith (+)
fromAscOccurList = MS . Map.filter (>0) . Map.fromAscListWith (+)

-- | /O(n)/. Build a multiset from an ascending list of elements\/occurence pairs where each elements appears only once.
-- /The precondition (input list is strictly ascending) is not checked./
fromDistinctAscOccurList :: [(a,Occur)] -> MultiSet a
fromDistinctAscOccurList = MS . Map.fromDistinctAscList
fromDistinctAscOccurList = MS . Map.filter (>0) . Map.fromDistinctAscList

{--------------------------------------------------------------------
Map
Expand Down