Skip to content

Fix order ListOfConstraintIndices with constraint bridges on variable function #1114

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
Jul 2, 2020
Merged

Fix order ListOfConstraintIndices with constraint bridges on variable function #1114

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
1d7b5b7
Fix order ListOfConstraintIndices with constraint bridges on variable…
blegat Jul 1, 2020
58cdead
More robust comparison of ListOfConstraints
blegat Jul 2, 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
2 changes: 2 additions & 0 deletions src/Bridges/Constraint/Constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module Constraint

using OrderedCollections # for OrderedDict in Map

using MathOptInterface
const MOI = MathOptInterface
const MOIU = MOI.Utilities
Expand Down
14 changes: 9 additions & 5 deletions src/Bridges/Constraint/map.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@ struct Map <: AbstractDict{MOI.ConstraintIndex, AbstractBridge}
bridges::Vector{Union{Nothing, AbstractBridge}}
# Constraint Index of bridged constraint -> Constraint type.
constraint_types::Vector{Tuple{DataType, DataType}}
# The order of the keys is used in `keys_of_type` which is used by
# `ListOfConstraintIndices`. Therefore they need to be in the order
# of creation so we need `OrderedDict` and not `Dict`.
# For `SingleVariable` constraints: (variable, set type) -> bridge
single_variable_constraints::Dict{Tuple{Int64, DataType}, AbstractBridge}
single_variable_constraints::OrderedDict{Tuple{Int64, DataType}, AbstractBridge}
# For `VectorVariable` constraints: (variable, set type) -> bridge
vector_of_variables_constraints::Dict{Tuple{Int64, DataType}, AbstractBridge}
vector_of_variables_constraints::OrderedDict{Tuple{Int64, DataType}, AbstractBridge}
end
function Map()
return Map(Union{Nothing, AbstractBridge}[],
Tuple{DataType, DataType}[],
Dict{Tuple{Int64, DataType}, AbstractBridge}(),
Dict{Tuple{Int64, DataType}, AbstractBridge}())
OrderedDict{Tuple{Int64, DataType}, AbstractBridge}(),
OrderedDict{Tuple{Int64, DataType}, AbstractBridge}())
end

# Implementation of `AbstractDict` interface.
Expand Down Expand Up @@ -141,7 +144,8 @@ function number_of_type end
"""
keys_of_type(map::Map, C::Type{<:MOI.ConstraintIndex})

Return a list of all the keys of type `C` in `map`.
Return a list of all the keys of type `C` in `map` in order order in which they
were created with `add_key_for_bridge`.
"""
function keys_of_type end

Expand Down
43 changes: 42 additions & 1 deletion test/Bridges/bridge_optimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,54 @@ end
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.ScalarAffineFunction{Int},MOI.Interval{Int}}())) == [c1]
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.ScalarAffineFunction{Int},MOI.GreaterThan{Int}}())) == [c2]

n = 4
z = MOI.add_variables(model, n)
scon_indices = MOI.ConstraintIndex{MOI.SingleVariable, MOI.Interval{Int}}[]
for (i, v) in enumerate([x; y; z])
f = MOI.SingleVariable(v)
c = MOI.add_constraint(model, f, MOI.Interval(i, 2i))
push!(scon_indices, c)

@test Set(MOI.get(model, MOI.ListOfConstraints())) == Set([(MOI.ScalarAffineFunction{Int},MOI.GreaterThan{Int}), (MOI.ScalarAffineFunction{Int},MOI.Interval{Int}), (MOI.SingleVariable, MOI.Interval{Int})])
test_num_constraints(model, MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}, 1)
test_num_constraints(model, MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}, 1)
test_num_constraints(model, MOI.SingleVariable, MOI.Interval{Int}, i)
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.ScalarAffineFunction{Int},MOI.Interval{Int}}())) == [c1]
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.ScalarAffineFunction{Int},MOI.GreaterThan{Int}}())) == [c2]
# The indices should be returned in order of creation
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.SingleVariable,MOI.Interval{Int}}())) == scon_indices
end

vcon_indices = MOI.ConstraintIndex{MOI.VectorOfVariables, MOI.Nonnegatives}[]
for (i, v) in enumerate(z)
f = MOI.VectorOfVariables([v])
c = MOI.add_constraint(model, f, MOI.Nonnegatives(1))
push!(vcon_indices, c)

@test Set(MOI.get(model, MOI.ListOfConstraints())) == Set([(MOI.ScalarAffineFunction{Int},MOI.GreaterThan{Int}), (MOI.ScalarAffineFunction{Int},MOI.Interval{Int}), (MOI.SingleVariable, MOI.Interval{Int}), (MOI.VectorOfVariables, MOI.Nonnegatives)])
test_num_constraints(model, MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}, 1)
test_num_constraints(model, MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}, 1)
test_num_constraints(model, MOI.SingleVariable, MOI.Interval{Int}, n + 2)
test_num_constraints(model, MOI.VectorOfVariables, MOI.Nonnegatives, i)
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.ScalarAffineFunction{Int},MOI.Interval{Int}}())) == [c1]
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.ScalarAffineFunction{Int},MOI.GreaterThan{Int}}())) == [c2]
# The indices should be returned in order of creation
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.SingleVariable,MOI.Interval{Int}}())) == scon_indices
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.VectorOfVariables,MOI.Nonnegatives}())) == vcon_indices
end

@test MOI.is_valid(model, c2)
MOI.delete(model, c2)

@test MOI.get(model, MOI.ListOfConstraints()) == [(MOI.ScalarAffineFunction{Int},MOI.Interval{Int})]
@test Set(MOI.get(model, MOI.ListOfConstraints())) == Set([(MOI.ScalarAffineFunction{Int},MOI.Interval{Int}), (MOI.SingleVariable, MOI.Interval{Int}), (MOI.VectorOfVariables, MOI.Nonnegatives)])
test_num_constraints(model, MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}, 0)
test_num_constraints(model, MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}, 1)
test_num_constraints(model, MOI.SingleVariable, MOI.Interval{Int}, n + 2)
test_num_constraints(model, MOI.VectorOfVariables, MOI.Nonnegatives, n)
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.ScalarAffineFunction{Int},MOI.Interval{Int}}())) == [c1]
# The indices should be returned in order of creation
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.SingleVariable,MOI.Interval{Int}}())) == scon_indices
@test (@inferred MOI.get(model, MOI.ListOfConstraintIndices{MOI.VectorOfVariables,MOI.Nonnegatives}())) == vcon_indices
end

@testset "Continuous Linear" begin
Expand Down