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

Jump to bottom

Universal constraint fallback #415

Merged
merged 15 commits into from
Jul 22, 2018
Merged

Universal constraint fallback #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aaaaca6
Universal constraint fallback
blegat Jun 30, 2018
9a0764b
Reference discussion on JuMP issue
blegat Jun 30, 2018
edd73aa
Fixes
blegat Jun 30, 2018
a381111
Updates
blegat Jul 8, 2018
3ea3f36
More fixes
blegat Jul 8, 2018
75cc0dc
Improve coverage and more fixes
blegat Jul 8, 2018
45f9dba
EqualTo -> LessThan
blegat Jul 13, 2018
1d8f811
Add name tests
blegat Jul 13, 2018
a0b846d
empty instead of creating new
blegat Jul 13, 2018
c5aa361
Empty names maps in uf
blegat Jul 13, 2018
67ad86e
Add tests
blegat Jul 13, 2018
0a95448
Fix canget for constraint attr
blegat Jul 13, 2018
66b096c
Add tests
blegat Jul 13, 2018
dd4cc14
Address comments
blegat Jul 18, 2018
bf61745
Address comments
blegat Jul 20, 2018
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
14 changes: 14 additions & 0 deletions src/Test/modellike.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ function nametest(model::MOI.ModelLike)

@test MOI.canset(model, MOI.ConstraintName(), typeof(c))
MOI.set!(model, MOI.ConstraintName(), c, "")
@test MOI.canset(model, MOI.ConstraintName(), typeof(c2))
MOI.set!(model, MOI.ConstraintName(), c2, "") # Shouldn't error with duplicate empty name

MOI.set!(model, MOI.ConstraintName(), c, "Con0")
Expand All @@ -64,6 +65,8 @@ function nametest(model::MOI.ModelLike)

@test MOI.canget(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.LessThan{Float64}}, "Con1")
@test !MOI.canget(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.LessThan{Float64}}, "Con2")
@test !MOI.canget(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.EqualTo{Float64}}, "Con1")
@test !MOI.canget(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.GreaterThan{Float64}}, "Con1")
@test MOI.canget(model, MOI.ConstraintIndex, "Con1")
@test !MOI.canget(model, MOI.ConstraintIndex, "Con2")

Expand All @@ -72,6 +75,17 @@ function nametest(model::MOI.ModelLike)
@test MOI.get(model, MOI.ConstraintIndex, "Con1") == c
@test_throws KeyError MOI.get(model, MOI.ConstraintIndex, "Con2")

MOI.set!(model, MOI.ConstraintName(), c2, "Con0")
@test MOI.canget(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.LessThan{Float64}}, "Con1")
@test !MOI.canget(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.LessThan{Float64}}, "Con0")
@test MOI.canget(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.EqualTo{Float64}}, "Con0")
@test !MOI.canget(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.EqualTo{Float64}}, "Con1")
@test MOI.canget(model, MOI.ConstraintIndex, "Con0")
@test MOI.canget(model, MOI.ConstraintIndex, "Con1")

@test MOI.get(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.LessThan{Float64}}, "Con1") == c
@test MOI.get(model, MOI.ConstraintIndex{MOI.ScalarAffineFunction{Float64},MOI.EqualTo{Float64}}, "Con0") == c2

if MOI.candelete(model, v[2])
MOI.delete!(model, v[2])
@test !MOI.canget(model, MOI.VariableIndex, "Var2")
Expand Down
93 changes: 64 additions & 29 deletions src/Utilities/model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,31 @@ function MOI.addvariables!(model::AbstractModel, n::Integer)
[MOI.addvariable!(model) for i in 1:n]
end

function _removevar(ci::CI, f, s, vi::VI)
(ci, removevariable(f, vi), s)
end
function _removevar(ci::CI, f::MOI.VectorOfVariables, s, vi::VI)
"""
removevariable(f::MOI.AbstractFunction, s::MOI.AbstractSet, vi::MOI.VariableIndex)

Return a tuple `(g, t)` representing the constraint `f`-in-`s` with the
variable `vi` removed. That is, the terms containing the variable `vi` in the
function `f` are removed and the dimension of the set `s` is updated if
needed (e.g. when `f` is a `VectorOfVariables` with `vi` being one of the
variables).
"""
removevariable(f, s, vi::VI) = removevariable(f, vi), s
function removevariable(f::MOI.VectorOfVariables, s, vi::VI)
g = removevariable(f, vi)
if length(g.variables) != length(f.variables)
t = updatedimension(s, length(g.variables))
else
t = s
end
(ci, g, t)
return g, t
end
function _removevar!(constrs::Vector, vi::VI)
for i in eachindex(constrs)
constrs[i] = _removevar(constrs[i]..., vi)
ci, f, s = constrs[i]
constrs[i] = (ci, removevariable(f, s, vi)...)
end
[]
return []
end
function _removevar!(constrs::Vector{<:C{MOI.SingleVariable}}, vi::VI)
# If a variable is removed, the SingleVariable constraints using this variable
Expand Down Expand Up @@ -137,16 +145,48 @@ end
MOI.canget(model::AbstractModel, ::MOI.Name) = true
MOI.get(model::AbstractModel, ::MOI.Name) = model.name

"""
check_can_assign_name(model::MOI.ModelLike, IndexType::Type{<:MOI.Index}, idx::MOI.Index, name::String)

Return a `Bool` indicating whether `name` is available to be used by an
index of type `IndexType` (i.e., it is not already used). type `IndexType`.
If it is already used and the index using this name is not `idx` then it throws
an error.
"""
function check_can_assign_name(model::MOI.ModelLike, IndexType::Type{<:MOI.Index}, idx::MOI.Index, name::String)
if !isempty(name) && MOI.canget(model, IndexType, name)
other_idx = MOI.get(model, IndexType, name)
if other_idx != idx
error("$(IndexType == VI ? :Variable : :Constraint) name $name is already used by $other_idx)")
end
return false
else
return true
end
end

"""
setname(index_to_names::Dict{<:MOI.Index, String}, names_to_index::Dict{String, <:MOI.Index}, idx::MOI.Index, name::String, idxtype::Symbol)

Sets the name of the index `idx` to the name `name` in the maps `index_to_names` and `names_to_index`.
If `name` is empty, and `idx` already has a name, it is removed.
"""
function setname(index_to_names::Dict{<:MOI.Index, String}, names_to_index::Dict{String, <:MOI.Index}, idx::MOI.Index, name::String)
if haskey(index_to_names, idx)
delete!(names_to_index, index_to_names[idx])
end
index_to_names[idx] = name
if !isempty(name)
names_to_index[name] = idx
end
return
end

MOI.canset(::AbstractModel, ::MOI.VariableName, vi::Type{VI}) = true
function MOI.set!(model::AbstractModel, ::MOI.VariableName, vi::VI, name::String)
if !isempty(name) && haskey(model.namesvar, name) && model.namesvar[name] != vi
error("Variable name $name is already used by $(model.namesvar[name])")
if check_can_assign_name(model, VI, vi, name)
setname(model.varnames, model.namesvar, vi, name)
end
if haskey(model.varnames, vi)
delete!(model.namesvar, model.varnames[vi])
end
model.varnames[vi] = name
model.namesvar[name] = vi
end
MOI.canget(::AbstractModel, ::MOI.VariableName, ::Type{VI}) = true
MOI.get(model::AbstractModel, ::MOI.VariableName, vi::VI) = get(model.varnames, vi, EMPTYSTRING)
Expand All @@ -161,14 +201,9 @@ end

MOI.canset(model::AbstractModel, ::MOI.ConstraintName, ::Type{<:CI}) = true
function MOI.set!(model::AbstractModel, ::MOI.ConstraintName, ci::CI, name::String)
if !isempty(name) && haskey(model.namescon, name) && model.namescon[name] != ci
error("Constraint name $name is already used by $(model.namescon[name])")
end
if haskey(model.connames, ci)
delete!(model.namescon, model.connames[ci])
if check_can_assign_name(model, CI, ci, name)
setname(model.connames, model.namescon, ci, name)
end
model.connames[ci] = name
model.namescon[name] = ci
end
MOI.canget(model::AbstractModel, ::MOI.ConstraintName, ::Type{<:CI}) = true
MOI.get(model::AbstractModel, ::MOI.ConstraintName, ci::CI) = get(model.connames, ci, EMPTYSTRING)
Expand Down Expand Up @@ -304,14 +339,14 @@ needsallocateload(model::AbstractModel) = false
allocatevariables!(model::AbstractModel, nvars) = MOI.addvariables!(model, nvars)
allocate!(model::AbstractModel, attr...) = MOI.set!(model, attr...)
canallocate(model::AbstractModel, attr::MOI.AnyAttribute) = MOI.canset(model, attr)
canallocate(model::AbstractModel, attr::MOI.AnyAttribute, IdxT::Type{<:MOI.Index}) = MOI.canset(model, attr, IdxT)
canallocate(model::AbstractModel, attr::MOI.AnyAttribute, IndexType::Type{<:MOI.Index}) = MOI.canset(model, attr, IndexType)
allocateconstraint!(model::AbstractModel, f::MOI.AbstractFunction, s::MOI.AbstractSet) = MOI.addconstraint!(model, f, s)
canallocateconstraint(model::AbstractModel, F::Type{<:MOI.AbstractFunction}, S::Type{<:MOI.AbstractSet}) = MOI.canaddconstraint(model, F, S)

function loadvariables!(::AbstractModel, nvars) end
function load!(::AbstractModel, attr...) end
canload(model::AbstractModel, attr::MOI.AnyAttribute) = MOI.canset(model, attr)
canload(model::AbstractModel, attr::MOI.AnyAttribute, IdxT::Type{<:MOI.Index}) = MOI.canset(model, attr, IdxT)
canload(model::AbstractModel, attr::MOI.AnyAttribute, IndexType::Type{<:MOI.Index}) = MOI.canset(model, attr, IndexType)
function loadconstraint!(::AbstractModel, ::CI, ::MOI.AbstractFunction, ::MOI.AbstractSet) end
canloadconstraint(model::AbstractModel, F::Type{<:MOI.AbstractFunction}, S::Type{<:MOI.AbstractSet}) = MOI.canaddconstraint(model, F, S)

Expand Down Expand Up @@ -518,13 +553,13 @@ macro model(modelname, ss, sst, vs, vst, sf, sft, vf, vft)
model.objectiveset = false
model.objective = $SAF{T}(MOI.ScalarAffineTerm{T}[], zero(T))
model.nextvariableid = 0
model.varindices = Set{$VI}()
model.varnames = Dict{Int64, String}()
model.namesvar = Dict{String, $VI}()
empty!(model.varindices)
empty!(model.varnames)
empty!(model.namesvar)
model.nextconstraintid = 0
model.connames = Dict{Int64, String}()
model.namescon = Dict{String, $CI}()
model.constrmap = Int[]
empty!(model.connames)
empty!(model.namescon)
empty!(model.constrmap)
$(Expr(:block, _callfield.(Ref(:($MOI.empty!)), funs)...))
end
end
Expand Down
Loading