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.

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

Do not set Name attributes if unsupported #2704

Merged
merged 3 commits into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions src/constraints.jl
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,19 @@ end

Get a constraint's name attribute.
"""
function name(con_ref::ConstraintRef{<:AbstractModel,<:_MOICON})
return MOI.get(con_ref.model, MOI.ConstraintName(), con_ref)::String
function name(con_ref::ConstraintRef{<:AbstractModel,C}) where {C<:_MOICON}
model = owner_model(con_ref)
if !MOI.supports(backend(model), MOI.ConstraintName(), C)
odow marked this conversation as resolved.
Show resolved Hide resolved
return ""
end
return MOI.get(model, MOI.ConstraintName(), con_ref)::String
end

# The name of VariableIndex constraints is empty.
function name(
::ConstraintRef{<:AbstractModel,<:MOI.ConstraintIndex{MOI.VariableIndex}},
)
return ""
end

"""
Expand Down Expand Up @@ -554,8 +565,10 @@ function add_constraint(
model.shapes[cindex] = cshape
end
con_ref = ConstraintRef(model, cindex, cshape)
if !(func isa MOI.VariableIndex) && !isempty(name)
# Don't set names for VariableIndex constraints!
# Only set names if appropriate!
if !(func isa MOI.VariableIndex) &&
!isempty(name) &&
MOI.supports(backend(model), MOI.ConstraintName(), typeof(cindex))
set_name(con_ref, name)
end
return con_ref
Expand Down
11 changes: 9 additions & 2 deletions src/variables.jl
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,13 @@ end

Get a variable's name attribute.
"""
name(v::VariableRef) = MOI.get(owner_model(v), MOI.VariableName(), v)::String
function name(v::VariableRef)
model = owner_model(v)
if !MOI.supports(backend(model), MOI.VariableName(), MOI.VariableIndex)
return ""
end
return MOI.get(model, MOI.VariableName(), v)::String
end

"""
set_name(v::VariableRef, s::AbstractString)
Expand Down Expand Up @@ -1021,7 +1027,8 @@ function _moi_add_variable(moi_backend, model, v::ScalarVariable, name::String)
index = MOI.add_variable(moi_backend)
var_ref = VariableRef(model, index)
_moi_constrain_variable(moi_backend, index, v.info)
if !isempty(name)
if !isempty(name) &&
MOI.supports(moi_backend, MOI.VariableName(), MOI.VariableIndex)
set_name(var_ref, name)
end
return var_ref
Expand Down
27 changes: 27 additions & 0 deletions test/constraint.jl
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,33 @@ function test_constraint_inference(ModelType, ::Any)
@test obj.set == MOI.LessThan(1.0)
end

struct _UnsupportedConstraintName <: MOI.AbstractOptimizer end
MOI.add_variable(::_UnsupportedConstraintName) = MOI.VariableIndex(1)
function MOI.supports_constraint(
::_UnsupportedConstraintName,
::Type{MOI.VectorOfVariables},
::Type{MOI.SOS1{Float64}},
)
return true
end
function MOI.add_constraint(
::_UnsupportedConstraintName,
::MOI.VectorOfVariables,
::MOI.SOS1{Float64},
)
return MOI.ConstraintIndex{MOI.VectorOfVariables,MOI.SOS1{Float64}}(1)
end
MOI.is_empty(::_UnsupportedConstraintName) = true

function test_Model_unsupported_ConstraintName(::Any, ::Any)
model = direct_model(_UnsupportedConstraintName())
@variable(model, x)
@constraint(model, c, [x, x] in SOS1())
@test c isa ConstraintRef
@test name(c) == ""
return
end

function runtests()
for name in names(@__MODULE__; all = true)
if !startswith("$(name)", "test_")
Expand Down
12 changes: 12 additions & 0 deletions test/variable.jl
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,18 @@ function test_Model_inf_fixed(::Any, ::Any)
end
end

struct _UnsupportedVariableName <: MOI.AbstractOptimizer end
MOI.add_variable(::_UnsupportedVariableName) = MOI.VariableIndex(1)
MOI.is_empty(::_UnsupportedVariableName) = true

function test_Model_unsupported_VariableName(::Any, ::Any)
model = direct_model(_UnsupportedVariableName())
@variable(model, x)
@test x isa VariableRef
@test name(x) == ""
return
end

function runtests()
for name in names(@__MODULE__; all = true)
if !startswith("$(name)", "test_")
Expand Down