Skip to content

Fix writing integer variables with float bounds #78

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 1 commit into from
Jul 22, 2024
Merged

Fix writing integer variables with float bounds #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/write.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,16 @@ function _write_variables(io::IO, model::Model{T}) where {T}
end
elseif info.is_int
if typemin(T) < lb && ub < typemax(T)
lb, ub = ceil(Int, lb), floor(Int, ub)
println(io, "var $lb .. $ub: $(info.name);")
else
println(io, "var int: $(info.name);")
if ub < typemax(T)
ub = floor(Int, ub)
println(io, "constraint int_le($(info.name), $ub);")
end
if typemin(T) < lb
lb = ceil(Int, lb)
println(io, "constraint int_le($lb, $(info.name));")
end
end
Expand Down
69 changes: 69 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,35 @@ function test_write_int()
return
end

function test_write_int_float_interval()
model = MiniZinc.Model{Float64}()
x, _ = MOI.add_constrained_variable(model, MOI.Integer())
MOI.add_constraint(model, x, MOI.Interval(1.5, 3.2))
@test sprint(write, model) == """
var 2 .. 3: x1;
solve satisfy;
"""
return
end

function test_write_int_float_greater_than()
model = MiniZinc.Model{Float64}()
x, _ = MOI.add_constrained_variable(model, MOI.Integer())
MOI.add_constraint(model, x, MOI.GreaterThan(1.5))
@test sprint(write, model) ==
"var int: x1;\nconstraint int_le(2, x1);\nsolve satisfy;\n"
return
end

function test_write_int_float_less_than()
model = MiniZinc.Model{Float64}()
x, _ = MOI.add_constrained_variable(model, MOI.Integer())
MOI.add_constraint(model, x, MOI.LessThan(1.5))
@test sprint(write, model) ==
"var int: x1;\nconstraint int_le(x1, 1);\nsolve satisfy;\n"
return
end

function test_write_interval()
model = MiniZinc.Model{Int}()
x, _ = MOI.add_constrained_variable(model, MOI.Integer())
Expand Down Expand Up @@ -1630,6 +1659,46 @@ function test_infix_unary_addition()
return
end

function test_integer_bounds_interval()
model = MOI.Utilities.Model{Float64}()
x = MOI.add_variables(model, 3)
MOI.add_constraint.(model, x, MOI.Integer())
MOI.add_constraint.(model, x, MOI.Interval(1.0, 3.0))
MOI.add_constraint(model, MOI.VectorOfVariables(x), MOI.AllDifferent(3))
mzn = MiniZinc.Optimizer{Float64}("highs")
index_map, _ = MOI.optimize!(mzn, model)
@test MOI.get(mzn, MOI.TerminationStatus()) == MOI.OPTIMAL
y = [MOI.get(mzn, MOI.VariablePrimal(), index_map[xi]) for xi in x]
@test sort(y) == [1, 2, 3]
return
end

function test_integer_bounds_greater_than()
model = MOI.Utilities.Model{Float64}()
x, _ = MOI.add_constrained_variable(model, MOI.Integer())
MOI.add_constraint(model, x, MOI.GreaterThan(1.5))
MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE)
MOI.set(model, MOI.ObjectiveFunction{MOI.VariableIndex}(), x)
mzn = MiniZinc.Optimizer{Float64}("highs")
index_map, _ = MOI.optimize!(mzn, model)
@test MOI.get(mzn, MOI.TerminationStatus()) == MOI.OPTIMAL
@test MOI.get(mzn, MOI.VariablePrimal(), index_map[x]) == 2
return
end

function test_integer_bounds_less_than_than()
model = MOI.Utilities.Model{Float64}()
x, _ = MOI.add_constrained_variable(model, MOI.Integer())
MOI.add_constraint(model, x, MOI.LessThan(1.5))
MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
MOI.set(model, MOI.ObjectiveFunction{MOI.VariableIndex}(), x)
mzn = MiniZinc.Optimizer{Float64}("highs")
index_map, _ = MOI.optimize!(mzn, model)
@test MOI.get(mzn, MOI.TerminationStatus()) == MOI.OPTIMAL
@test MOI.get(mzn, MOI.VariablePrimal(), index_map[x]) == 1
return
end

end

TestMiniZinc.runtests()
Loading