Skip to content

Fix Bridges.Constraint.ScalarizeBridge with unset starting values #1435

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
Jul 5, 2021
Merged

Fix Bridges.Constraint.ScalarizeBridge with unset starting values #1435

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
7a47627
Fix Bridges.Constraint.ScalarizeBridge with unset starting values
blegat Jul 3, 2021
e75f123
Update scalarize.jl
odow Jul 4, 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
40 changes: 38 additions & 2 deletions src/Bridges/Constraint/scalarize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,36 @@ end

function MOI.get(
model::MOI.ModelLike,
attr::Union{MOI.ConstraintPrimal,MOI.ConstraintPrimalStart},
attr::MOI.ConstraintPrimal,
bridge::ScalarizeBridge,
)
return MOI.get.(model, attr, bridge.scalar_constraints) .+ bridge.constants
end

function MOI.get(
model::MOI.ModelLike,
attr::MOI.ConstraintPrimalStart,
bridge::ScalarizeBridge,
)
values = MOI.get.(model, attr, bridge.scalar_constraints)
if any(value -> value === nothing, values)
return
end
return values .+ bridge.constants
end

function MOI.set(
model::MOI.ModelLike,
attr::MOI.ConstraintPrimalStart,
bridge::ScalarizeBridge,
::Nothing,
)
for ci in bridge.scalar_constraints
MOI.set(model, attr, ci, nothing)
end
return
end

function MOI.set(
model::MOI.ModelLike,
attr::MOI.ConstraintPrimalStart,
Expand All @@ -147,12 +171,24 @@ end

function MOI.get(
model::MOI.ModelLike,
attr::Union{MOI.ConstraintDual,MOI.ConstraintDualStart},
attr::MOI.ConstraintDual,
bridge::ScalarizeBridge,
)
return MOI.get.(model, attr, bridge.scalar_constraints)
end

function MOI.get(
model::MOI.ModelLike,
attr::MOI.ConstraintDualStart,
bridge::ScalarizeBridge,
)
values = MOI.get.(model, attr, bridge.scalar_constraints)
if any(value -> value === nothing, values)
return
end
return values
end

function MOI.set(
model::MOI.ModelLike,
attr::MOI.ConstraintDualStart,
Expand Down
11 changes: 11 additions & 0 deletions test/Bridges/Constraint/scalarize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,15 @@ config = MOIT.Config()
[7, 2, -4, 7],
)
MOIT.lin2ftest(bridged_mock, config)

@testset "constraint_ConstraintPrimalStart" begin
MOI.Test.test_constraint_ConstraintPrimalStart(
bridged_mock,
MOI.Test.Config(),
)
MOI.Test.test_constraint_ConstraintDualStart(
bridged_mock,
MOI.Test.Config(),
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah my next step here is to migrate the Utilities and Bridges modules to the new test sets.

end
end