Skip to content

For normalize_and_add_constraint for Integer and ZeroOne #1643

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
Oct 28, 2021
Merged

For normalize_and_add_constraint for Integer and ZeroOne #1643

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
8bdf5be
For normalize_and_add_constraint for Integer and ZeroOne
blegat Oct 28, 2021
0f06065
Implement supports_shift_constant for UnknownScalarSet
blegat Oct 28, 2021
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
1 change: 1 addition & 0 deletions src/Test/test_model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ MOI.constant(set::UnknownScalarSet) = set.constant

Base.copy(set::UnknownScalarSet) = UnknownScalarSet(copy(MOI.constant(set)))

MOIU.supports_shift_constant(::Type{<:UnknownScalarSet}) = true
function MOIU.shift_constant(set::UnknownScalarSet, offset)
return UnknownScalarSet(MOI.constant(set) + offset)
end
Expand Down
10 changes: 6 additions & 4 deletions src/Utilities/constraints.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ function normalize_constant(
set::MOI.AbstractScalarSet;
allow_modify_function::Bool = false,
) where {T}
set = shift_constant(set, -func.constant)
if !allow_modify_function
func = copy(func)
if supports_shift_constant(typeof(set))
set = shift_constant(set, -func.constant)
if !allow_modify_function
func = copy(func)
end
func.constant = zero(T)
end
func.constant = zero(T)
return func, set
end
4 changes: 4 additions & 0 deletions test/Utilities/constraints.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ function test_normalize_and_add_constrant_ScalarAffineFunction()
model = MOI.Utilities.Model{Float64}()
x = MOI.add_variable(model)
f = MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(1.0, x)], 2.0)
int = MOI.Utilities.normalize_and_add_constraint(model, f, MOI.Integer())
@test f.constant == 2.0
@test MOI.get(model, MOI.ConstraintFunction(), int) ≈ f
@test MOI.get(model, MOI.ConstraintSet(), int) == MOI.Integer()
g = MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(1.0, x)], 0.0)
ci = MOI.Utilities.normalize_and_add_constraint(model, f, MOI.EqualTo(3.0))
@test f.constant == 2.0
Expand Down