-
Notifications
You must be signed in to change notification settings - Fork 97
Add CleverDicts as submodule to MOI.Utilities #767
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
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e6af09c
Add CleverDicts submodule
odow 6b37e3e
Update docs
odow 3de7234
Improve test coverage
odow f41b537
Add comments justifying iteration decisions
odow 6d13308
Rename new_item -> add_item
odow 3a5b0dd
Add isempty
odow bb536a8
Use isempty(c.vector) and standardize on c.dict === nothing
odow f5285e0
Overload MOI.VariableIndex as key for CleverDict
odow File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,231 @@ | ||
| module CleverDicts | ||
|
|
||
| # The following two functions are overloaded for `MOI.VariableIndex` here | ||
| # it is the original use-case for `CleverDict`, and it would be type-piracy for | ||
| # solvers using `CleverDicts` to implement it themselves. | ||
|
|
||
| import MathOptInterface | ||
|
|
||
| function index_to_key(::Type{MathOptInterface.VariableIndex}, index::Int) | ||
| return MathOptInterface.VariableIndex(index) | ||
| end | ||
|
|
||
| key_to_index(key::MathOptInterface.VariableIndex) = key.value | ||
|
|
||
| # Now, on with `CleverDicts`. | ||
|
|
||
| import OrderedCollections | ||
|
|
||
| """ | ||
| CleverDict{K, V} | ||
|
|
||
| A smart storage type for managing sequential objects with non-decreasing integer | ||
| indices. | ||
|
|
||
| Provided no keys are deleted, the backing storage is a `Vector{V}`. Once a key | ||
| has been deleted, the backing storage switches to an `OrderedDict{K, V}`. | ||
|
|
||
| The i'th ordered element can be obtained with `c[LinearIndex(i)]`. | ||
|
|
||
| Note that querying a `LinearIndex` immediately after deleting a key via | ||
| `delete!` is very slow. (It requires a rebuild of an ordered list of variables.) | ||
|
|
||
| Store an item `val` using `add_item(c::CleverDict, val)`. `add_item` returns a | ||
| key corresponding to the stored item. | ||
|
|
||
| Overload the functions `index_to_key` and `key_to_index` to enable mappings | ||
| between the integer index of the vector and the dictionary key. | ||
|
|
||
| ## Example | ||
|
|
||
| ```julia | ||
| struct MyKey | ||
| x::Int | ||
| end | ||
| index_to_key(::Type{MyKey}, i::Int) = MyKey(i) | ||
| key_to_index(key::MyKey) = key.x | ||
| ``` | ||
| """ | ||
| mutable struct CleverDict{K, V} | ||
| last_index::Int | ||
| vector::Union{Nothing, Vector{V}} | ||
| dict::Union{Nothing, OrderedCollections.OrderedDict{K, V}} | ||
| CleverDict{K, V}() where {K, V} = new{K, V}(0, V[], nothing) | ||
| end | ||
|
|
||
| """ | ||
| index_to_key(::Type{K}, index::Int) | ||
|
|
||
| Create a new key associated with the integer value `index`. | ||
| """ | ||
| function index_to_key end | ||
|
|
||
| """ | ||
| key_to_index(key::K) | ||
|
|
||
| Map `key` to an integer valued index, assuming that there have been no | ||
| deletions. | ||
| """ | ||
| function key_to_index end | ||
|
|
||
| """ | ||
| add_item(c::CleverDict{K, V}, val::Val)::K where {K, V} | ||
|
|
||
| Set `val` in the next available key, and return that key. | ||
| """ | ||
| function add_item(c::CleverDict{K, V}, val::V)::K where {K, V} | ||
| c.last_index += 1 | ||
| key = index_to_key(K, c.last_index) | ||
| if c.dict === nothing | ||
| push!(c.vector, val) | ||
| else | ||
| c.dict[key] = val | ||
| # If there is a vector (e.g., because it has been rebuild for | ||
| # `LinearIndex`), clear it. | ||
| c.vector = nothing | ||
| end | ||
| return key | ||
| end | ||
|
|
||
| function Base.empty!(c::CleverDict{K, V})::Nothing where {K, V} | ||
| c.vector = V[] | ||
| c.last_index = 0 | ||
| c.dict = nothing | ||
| return | ||
| end | ||
|
|
||
| function Base.getindex(c::CleverDict{K, V}, key::K)::V where {K, V} | ||
| # Perform this `haskey` check up front to detect getting with keys that are | ||
| # invalid (i.e., have previously been deleted). | ||
| if !haskey(c, key) | ||
| throw(KeyError(key)) | ||
| end | ||
| # Case I) no call to `Base.delete!`, so return the element: | ||
| # Case II) `Base.delete!` must have been called, so return the element | ||
| # from the dictionary. | ||
| return c.dict === nothing ? c.vector[key_to_index(key)] : c.dict[key] | ||
| end | ||
|
|
||
| function Base.setindex!(c::CleverDict{K, V}, val::V, key::K)::V where {K, V} | ||
| # Perform this `haskey` check up front to detect setting with keys that are | ||
| # invalid (i.e., have already been deleted). You can only call setindex! | ||
| # with a key obtained from `new_key` that hasn't been deleted. | ||
| if !haskey(c, key) | ||
| throw(KeyError(key)) | ||
| elseif c.dict === nothing | ||
| @assert c.vector !== nothing | ||
| c.vector[key_to_index(key)] = val | ||
| else | ||
| c.dict[key] = val | ||
| end | ||
| return val | ||
| end | ||
|
|
||
| struct LinearIndex | ||
| i::Int | ||
| end | ||
|
|
||
| function Base.getindex(c::CleverDict{K, V}, index::LinearIndex)::V where {K, V} | ||
| if !(1 <= index.i <= length(c)) | ||
| throw(KeyError(index)) | ||
| end | ||
| # Get the `index` linear element. If `c.vector` is currently `nothing` | ||
| # (i.e., there has been a deletion), rebuild `c.vector`. This is a | ||
| # trade-off: We could ensure `c.vector` is always updated, but this requires | ||
| # a `splice!` in `delete!`, making deletions costly. However, it makes this | ||
| # `getindex` operation trival because we would never have to rebuild the | ||
| # vector. | ||
| # The current implemented approach offers quick deletions, but an expensive | ||
| # rebuild the first time you query a `LinearIndex` after a deletion or a new | ||
| # key is added. Once the rebuild is done, there are quick queries until the | ||
| # next deletion or addition. Thus, the worst-case is a user repeatedly | ||
| # deleting a key and then querying a LinearIndex (e.g., getting the MOI | ||
| # objective function). | ||
| if c.vector === nothing | ||
| c.vector = Vector{V}(undef, length(c)) | ||
| for (i, val) in enumerate(values(c.dict)) | ||
| c.vector[i] = val | ||
| end | ||
| end | ||
| return c.vector[index.i]::V | ||
| 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}}() | ||
| for (i, info) in enumerate(c.vector) | ||
| c.dict[index_to_key(K, i)] = info | ||
| end | ||
| end | ||
| delete!(c.dict, key) | ||
| c.vector = nothing | ||
| return | ||
| end | ||
|
|
||
| function Base.length(c::CleverDict)::Int | ||
| return c.dict === nothing ? length(c.vector) : length(c.dict) | ||
| end | ||
|
|
||
| function Base.isempty(c::CleverDict) | ||
| return c.dict === nothing ? isempty(c.vector) : isempty(c.dict) | ||
| end | ||
|
|
||
| Base.haskey(::CleverDict, key) = false | ||
| function Base.haskey(c::CleverDict{K, V}, key::K)::Bool where {K, V} | ||
| if c.dict === nothing | ||
| return 1 <= key_to_index(key) <= length(c.vector) | ||
| else | ||
| return haskey(c.dict, key) | ||
| end | ||
| end | ||
|
|
||
| # Here, we implement the iterate functions for our `CleverDict`. If the backing | ||
| # datastructure is an `OrderedDict`, we just forward `iterate` to the dict. If | ||
| # it's the vector, we create a key-value pair so that `iterate` returns the same | ||
| # type regardless of the backing datastructure. To help inference, we annotate | ||
| # the return type. | ||
| # | ||
| # Also note that iterating an `OrderedDict` returns an `Int` state variable. | ||
| # This is identical to the type of the state variable that we return when | ||
| # iterating the vector, so we can add a type restriction on | ||
| # `iterate(c, s::Int)`. | ||
|
|
||
| function Base.iterate( | ||
| c::CleverDict{K, V} | ||
| )::Union{Nothing, Tuple{Pair{K, V}, Int}} where {K, V} | ||
| if c.dict === nothing | ||
| @assert c.vector !== nothing | ||
| if isempty(c.vector) | ||
| return nothing | ||
| end | ||
| key = index_to_key(K, 1) | ||
| return key => c.vector[1], 2 | ||
| else | ||
| return iterate(c.dict) | ||
| end | ||
| end | ||
|
|
||
| function Base.iterate( | ||
| c::CleverDict{K, V}, s::Int | ||
odow marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| )::Union{Nothing, Tuple{Pair{K, V}, Int}} where {K, V} | ||
| if c.dict === nothing | ||
| @assert c.vector !== nothing | ||
| if s > length(c.vector) | ||
| return nothing | ||
| end | ||
| key = index_to_key(K, s) | ||
| return key => c.vector[s], s + 1 | ||
| else | ||
| return iterate(c.dict, s) | ||
| end | ||
| end | ||
|
|
||
| function Base.values(c::CleverDict{K, V}) where {K, V} | ||
| return c.dict === nothing ? c.vector : values(c.dict) | ||
| end | ||
|
|
||
| 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 | ||
|
|
||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@blegat: I've implemented the methods to use
CleverDictwithMOI.VariableIndexsince it would be type-piracy for solvers to implement the methods. Any ideas for better places to put them? Or is here okay?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No this seams appropriate. We it would make even more sense if we add
const CleverVariableDict{V} = CleverDict{MOI.VariableIndex, V}