Skip to content
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

Implement DoubleDicts #1126

Merged
merged 12 commits into from
Jul 24, 2020
Merged

Implement DoubleDicts #1126

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6162f4c
[ci skip] double dict first sketch
joaquimg Jul 12, 2020
c838b5c
wrapping up double dicts
joaquimg Jul 12, 2020
eb36bd3
replace index map
joaquimg Jul 12, 2020
15c2f03
make double dict mode generic to handle any values type
joaquimg Jul 12, 2020
ce3a714
Merge remote-tracking branch 'origin/master' into jg/doubledict
joaquimg Jul 12, 2020
9ec9971
fix string
joaquimg Jul 13, 2020
cfacfb0
add mutability and getindex
joaquimg Jul 13, 2020
453b5c0
docs tests and fixes
joaquimg Jul 14, 2020
e50dd28
more tests
joaquimg Jul 14, 2020
6761b18
simplify type definitions
joaquimg Jul 14, 2020
3b9103b
Add FunctionSetDoubleDict
joaquimg Jul 18, 2020
e1c065e
fix abstract types
joaquimg Jul 19, 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: 6 additions & 1 deletion src/Utilities/CleverDicts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ index_to_key(::Type{MyKey}, i::Int) = MyKey(i)
key_to_index(key::MyKey) = key.x
```
"""
mutable struct CleverDict{K, V}
mutable struct CleverDict{K, V} <: AbstractDict{K, V}
last_index::Int
vector::Union{Nothing, Vector{V}}
dict::Union{Nothing, OrderedCollections.OrderedDict{K, V}}
Expand Down Expand Up @@ -153,6 +153,7 @@ end
function Base.delete!(c::CleverDict{K, V}, key::K)::Nothing where {K, V}
if c.dict === nothing
c.dict = OrderedCollections.OrderedDict{K, Union{Nothing, V}}()
sizehint!(c.dict, length(c.vector))
for (i, info) in enumerate(c.vector)
c.dict[index_to_key(K, i)] = info
end
Expand Down Expand Up @@ -228,4 +229,8 @@ function Base.keys(c::CleverDict{K, V}) where {K, V}
return c.dict === nothing ? index_to_key.(K, 1:length(c)) : keys(c.dict)
end

function Base.sizehint!(c::CleverDict{K, V}, n) where {K, V}
return c.dict === nothing ? sizehint!(c.vector, n) : sizehint!(c.dict, n)
end

end
Loading