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

Use MOI.add_constrained_variable when creating variables #3863

Merged
merged 7 commits into from
Nov 1, 2024
Merged

Use MOI.add_constrained_variable when creating variables #3863

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
22fff6f
Use MOI.add_constrained_variable when creating variables
odow Oct 31, 2024
c209949
Update src/variables.jl
odow Oct 31, 2024
ab80046
Update variables.jl
odow Oct 31, 2024
636191e
Update
odow Nov 1, 2024
33a626a
Update src/variables.jl
odow Nov 1, 2024
f7a26ba
Add tests
odow Nov 1, 2024
a79859c
Merge branch 'od/add-constrained-variable' of https://github.com/jump…
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
93 changes: 65 additions & 28 deletions src/variables.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1965,20 +1965,69 @@
return _moi_add_variable(backend(model), model, v, name)
end

function _moi_add_constrained_variable(
moi_backend::MOI.ModelLike,
::Nothing,
set::MOI.AbstractScalarSet,
)
x, _ = MOI.add_constrained_variable(moi_backend, set)
return x
end

function _moi_add_constrained_variable(
moi_backend::MOI.ModelLike,
x::MOI.VariableIndex,
set::MOI.AbstractScalarSet,
)
MOI.add_constraint(moi_backend, x, set)
return x
end

function _moi_add_variable(
moi_backend,
model::GenericModel{T},
v::ScalarVariable,
name::String,
) where {T}
index = MOI.add_variable(moi_backend)
var_ref = GenericVariableRef(model, index)
_moi_constrain_variable(moi_backend, index, v.info, T)
if !isempty(name) &&
MOI.supports(moi_backend, MOI.VariableName(), MOI.VariableIndex)
set_name(var_ref, name)
# We don't call the _moi* versions (for example, _moi_set_lower_bound)
# because they have extra checks that are not necessary for newly created
# variables.
index = nothing
odow marked this conversation as resolved.
Show resolved Hide resolved
info = v.info
if info.has_lb
set_lb =
MOI.GreaterThan{T}(_to_value(T, info.lower_bound, "lower bound"))
index = _moi_add_constrained_variable(moi_backend, index, set_lb)
end
return var_ref
if info.has_ub
set_ub = MOI.LessThan{T}(_to_value(T, info.upper_bound, "upper bound"))
index = _moi_add_constrained_variable(moi_backend, index, set_ub)
end
if info.has_fix
@show info
odow marked this conversation as resolved.
Show resolved Hide resolved
set_eq = MOI.EqualTo{T}(_to_value(T, info.fixed_value, "fixed value"))
index = _moi_add_constrained_variable(moi_backend, index, set_eq)
end
if info.binary
index = _moi_add_constrained_variable(moi_backend, index, MOI.ZeroOne())
end
if info.integer
index = _moi_add_constrained_variable(moi_backend, index, MOI.Integer())
end
if index === nothing
index = MOI.add_variable(moi_backend)
end
x = GenericVariableRef(model, index::MOI.VariableIndex)
if info.has_start && info.start !== nothing
start = _to_value(T, info.start, "start value")
MOI.set(moi_backend, MOI.VariablePrimalStart(), index, start)
end
if !isempty(name)
if MOI.supports(moi_backend, MOI.VariableName(), MOI.VariableIndex)
set_name(x, name)
end
end
return x
end

_to_value(::Type{T}, value::T, ::String) where {T} = value
Expand Down Expand Up @@ -2012,25 +2061,16 @@
# because they have extra checks that are not necessary for newly created
# variables.
if info.has_lb
_moi_add_constraint(
moi_backend,
index,
MOI.GreaterThan{T}(_to_value(T, info.lower_bound, "lower bound")),
)
lb = _to_value(T, info.lower_bound, "lower bound")
_moi_add_constraint(moi_backend, index, MOI.GreaterThan{T}(lb))
end
if info.has_ub
_moi_add_constraint(
moi_backend,
index,
MOI.LessThan{T}(_to_value(T, info.upper_bound, "upper bound")),
)
ub = _to_value(T, info.upper_bound, "upper bound")
_moi_add_constraint(moi_backend, index, MOI.LessThan{T}(ub))
end
if info.has_fix
_moi_add_constraint(
moi_backend,
index,
MOI.EqualTo{T}(_to_value(T, info.fixed_value, "fixed value")),
)
eq = _to_value(T, info.fixed_value, "fixed value")
_moi_add_constraint(moi_backend, index, MOI.EqualTo{T}(eq))

Check warning on line 2073 in src/variables.jl

View check run for this annotation

Codecov / codecov/patch

src/variables.jl#L2072-L2073 

Added lines #L2072 - L2073 were not covered by tests
end
if info.binary
_moi_add_constraint(moi_backend, index, MOI.ZeroOne())
Expand All @@ -2039,13 +2079,10 @@
_moi_add_constraint(moi_backend, index, MOI.Integer())
end
if info.has_start && info.start !== nothing
MOI.set(
moi_backend,
MOI.VariablePrimalStart(),
index,
_to_value(T, info.start, "start value"),
)
start = _to_value(T, info.start, "start value")
MOI.set(moi_backend, MOI.VariablePrimalStart(), index, start)
end
return
end

"""
Expand Down
18 changes: 18 additions & 0 deletions test/test_variable.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,4 +1662,22 @@ function test_value_number()
return
end

function test_add_constrained_variable()
model = Model()
@variable(model, x1 >= 0)
@test has_lower_bound(x1)
@variable(model, x2 <= 0)
@test has_upper_bound(x2)
@variable(model, x3 == 0)
@test is_fixed(x3)
@variable(model, x4, Int)
@test is_integer(x4)
@variable(model, x5, Bin)
@test is_binary(x5)
@variable(model, x6 >= 0, Int)
@test has_lower_bound(x6)
@test is_integer(x6)
return
end

end # module TestVariable
Loading