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

Improve performance of haskey lookups #246

Merged
merged 6 commits into from
Nov 1, 2024
Merged

Improve performance of haskey lookups #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d63fe6f
Improve performance of haskey lookups
odow Oct 31, 2024
5cc6fbc
Add tests
odow Oct 31, 2024
a88fabf
Update test/MOI_wrapper.jl
odow Oct 31, 2024
8be2bd2
Update
odow Nov 1, 2024
62e3d5b
Merge branch 'od/haskey' of https://github.com/jump-dev/HiGHS.jl into…
odow Nov 1, 2024
ea220b8
Apply suggestions from code review
odow Nov 1, 2024
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
100 changes: 59 additions & 41 deletions src/MOI_wrapper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,10 +731,11 @@ function MOI.get(model::Optimizer, ::MOI.ListOfVariableIndices)
end

function _info(model::Optimizer, key::MOI.VariableIndex)
if haskey(model.variable_info, key)
return model.variable_info[key]
info = get(model.variable_info, key, nothing)
if info === nothing
return throw(MOI.InvalidIndex(key))
end
return throw(MOI.InvalidIndex(key))
return info
end

"""
Expand Down Expand Up @@ -795,14 +796,13 @@ function MOI.get(model::Optimizer, ::Type{MOI.VariableIndex}, name::String)
if model.name_to_variable === nothing
_rebuild_name_to_variable(model)
end
if haskey(model.name_to_variable, name)
variable = model.name_to_variable[name]
if variable === nothing
error("Duplicate name detected: $(name)")
end
return variable
variable = get(model.name_to_variable, name, missing)
if variable === nothing
error("Duplicate name detected: $(name)")
elseif variable === missing
return nothing # Variable with this name does not exist
end
return nothing
return variable::MOI.VariableIndex
end

function MOI.get(model::Optimizer, ::MOI.VariableName, v::MOI.VariableIndex)
Expand Down Expand Up @@ -1172,10 +1172,11 @@ function _info(
c::MOI.ConstraintIndex{MOI.VariableIndex,<:Any},
)
var_index = MOI.VariableIndex(c.value)
if haskey(model.variable_info, var_index)
return _info(model, var_index)
info = get(model.variable_info, var_index, nothing)
if info === nothing
return throw(MOI.InvalidIndex(c))
end
return throw(MOI.InvalidIndex(c))
return info
end

"""
Expand All @@ -1197,40 +1198,46 @@ function MOI.is_valid(
model::Optimizer,
c::MOI.ConstraintIndex{MOI.VariableIndex,MOI.LessThan{Float64}},
)
if haskey(model.variable_info, MOI.VariableIndex(c.value))
info = _info(model, c)
return info.bound == _BOUND_LESS_THAN ||
info.bound == _BOUND_LESS_AND_GREATER_THAN
info = get(model.variable_info, MOI.VariableIndex(c.value), nothing)
if info === nothing
return false
end
return false
return info.bound == _BOUND_LESS_THAN ||
info.bound == _BOUND_LESS_AND_GREATER_THAN
end

function MOI.is_valid(
model::Optimizer,
c::MOI.ConstraintIndex{MOI.VariableIndex,MOI.GreaterThan{Float64}},
)
if haskey(model.variable_info, MOI.VariableIndex(c.value))
info = _info(model, c)
return info.bound == _BOUND_GREATER_THAN ||
info.bound == _BOUND_LESS_AND_GREATER_THAN
info = get(model.variable_info, MOI.VariableIndex(c.value), nothing)
if info === nothing
return false
end
return false
return info.bound == _BOUND_GREATER_THAN ||
info.bound == _BOUND_LESS_AND_GREATER_THAN
end

function MOI.is_valid(
model::Optimizer,
c::MOI.ConstraintIndex{MOI.VariableIndex,MOI.Interval{Float64}},
)
return haskey(model.variable_info, MOI.VariableIndex(c.value)) &&
_info(model, c).bound == _BOUND_INTERVAL
info = get(model.variable_info, MOI.VariableIndex(c.value), nothing)
if info === nothing
return false
end
return info.bound == _BOUND_INTERVAL
end

function MOI.is_valid(
model::Optimizer,
c::MOI.ConstraintIndex{MOI.VariableIndex,MOI.EqualTo{Float64}},
)
return haskey(model.variable_info, MOI.VariableIndex(c.value)) &&
_info(model, c).bound == _BOUND_EQUAL_TO
info = get(model.variable_info, MOI.VariableIndex(c.value), nothing)
if info === nothing
return false
end
return info.bound == _BOUND_EQUAL_TO
end

function MOI.get(
Expand Down Expand Up @@ -1495,10 +1502,11 @@ function _info(
c::MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},<:_SCALAR_SETS},
)
key = _ConstraintKey(c.value)
if haskey(model.affine_constraint_info, key)
return model.affine_constraint_info[key]
info = get(model.affine_constraint_info, key, nothing)
if info === nothing
return throw(MOI.InvalidIndex(c))
end
return throw(MOI.InvalidIndex(c))
return info
end

function row(
Expand Down Expand Up @@ -1742,14 +1750,13 @@ function MOI.get(model::Optimizer, ::Type{MOI.ConstraintIndex}, name::String)
if model.name_to_constraint_index === nothing
_rebuild_name_to_constraint_index(model)
end
if haskey(model.name_to_constraint_index, name)
constr = model.name_to_constraint_index[name]
if constr === nothing
error("Duplicate constraint name detected: $(name)")
end
return constr
constraint = get(model.name_to_constraint_index, name, missing)
if constraint === nothing
error("Duplicate constraint name detected: $(name)")
elseif constraint === missing
return nothing # No constraint exists with this name
end
return nothing
return constraint
end

function MOI.get(
Expand Down Expand Up @@ -2421,14 +2428,22 @@ function MOI.is_valid(
model::Optimizer,
ci::MOI.ConstraintIndex{MOI.VariableIndex,MOI.Integer},
)
return _info(model, ci).type == _TYPE_INTEGER
info = get(model.variable_info, MOI.VariableIndex(ci.value), nothing)
if info === nothing
return false
end
return info.type == _TYPE_INTEGER
end

function MOI.is_valid(
model::Optimizer,
ci::MOI.ConstraintIndex{MOI.VariableIndex,MOI.ZeroOne},
)
return _info(model, ci).type == _TYPE_BINARY
info = get(model.variable_info, MOI.VariableIndex(ci.value), nothing)
if info === nothing
return false
end
return info.type == _TYPE_BINARY
end

function MOI.get(
Expand Down Expand Up @@ -2545,8 +2560,11 @@ function MOI.is_valid(
model::Optimizer,
c::MOI.ConstraintIndex{MOI.VariableIndex,S},
) where {S<:Union{MOI.Semicontinuous{Float64},MOI.Semiinteger{Float64}}}
return haskey(model.variable_info, MOI.VariableIndex(c.value)) &&
_info(model, c).bound == _bound_type(S)
info = get(model.variable_info, MOI.VariableIndex(c.value), nothing)
if info === nothing
return false
end
return info.bound == _bound_type(S)
end

function MOI.add_constraint(
Expand Down
17 changes: 14 additions & 3 deletions test/MOI_wrapper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,9 +699,20 @@ end

function test_is_valid_variable_bound()
model = HiGHS.Optimizer()
ci = MOI.ConstraintIndex{MOI.VariableIndex,MOI.LessThan{Float64}}(1)
@test_throws MOI.InvalidIndex HiGHS.column(model, ci)
@test !MOI.is_valid(model, ci)
for S in (
MOI.LessThan{Float64},
MOI.GreaterThan{Float64},
MOI.EqualTo{Float64},
MOI.Interval{Float64},
MOI.Semicontinuous{Float64},
MOI.Semiinteger{Float64},
MOI.ZeroOne,
MOI.Integer,
)
ci = MOI.ConstraintIndex{MOI.VariableIndex,S}(1)
@test_throws MOI.InvalidIndex HiGHS.column(model, ci)
@test !MOI.is_valid(model, ci)
end
return
end

Expand Down
Loading