Skip to content

Remove special iterators from CleverDict #2051

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 2 commits into from
Nov 20, 2022
Merged

Remove special iterators from CleverDict #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
376cb3e
Remove special iterators from CleverDict
joaquimg Nov 20, 2022
313c0a8
add collect to follow correct output of method
joaquimg Nov 20, 2022
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
9 changes: 0 additions & 9 deletions src/Utilities/CleverDicts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,6 @@ function Base.haskey(c::CleverDict{K}, key::K) where {K}
return haskey(c.dict, key)
end

function Base.keys(c::CleverDict{K}) where {K}
if _is_dense(c)
return K[_inverse_hash(c, i) for i in 1:length(c.vector)]
end
return collect(keys(c.dict))
end

function Base.get(c::CleverDict, key, default)
if _is_dense(c)
if !haskey(c, key)
Expand Down Expand Up @@ -316,8 +309,6 @@ function Base.resize!(c::CleverDict{K,V}, n) where {K,V}
return
end

Base.values(d::CleverDict) = _is_dense(d) ? d.vector : values(d.dict)

# TODO `map!(f, values(dict::AbstractDict))` requires Julia 1.2 or later,
# use `map_values` once we drop Julia 1.1 and earlier.
function map_values!(f::Function, d::CleverDict)
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/vector_of_constraints.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function MOI.get(
v::VectorOfConstraints{F,S},
::MOI.ListOfConstraintIndices{F,S},
) where {F,S}
return keys(v.constraints)
return collect(keys(v.constraints))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I guess the issue was that we were returning the concrete list of keys, instead of a lazy evaluator?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exactly!

end

function MOI.modify(
Expand Down