Skip to content

Test getting CanonicalConstraintFunction #1507

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 5 commits into from
Aug 6, 2021
Merged

Test getting CanonicalConstraintFunction #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8911029
Test getting CanonicalConstraintFunction
odow Aug 4, 2021
4f59ef8
Update function_conversion.jl
odow Aug 4, 2021
68182eb
ConstraintFunction is never not canonical
odow Aug 4, 2021
0782460
Merge branch 'od/canonical-constraint' of https://github.com/jump-dev…
odow Aug 4, 2021
e86f6cc
Fix
odow Aug 5, 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
20 changes: 18 additions & 2 deletions src/Bridges/Constraint/functionize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,20 @@ function MOI.set(
return
end

function MOI.get(
model::MOI.ModelLike,
attr::MOI.CanonicalConstraintFunction,
b::ScalarFunctionizeBridge,
)
return convert(MOI.SingleVariable, MOI.get(model, attr, b.constraint))
end

function MOI.get(
model::MOI.ModelLike,
attr::MOI.ConstraintFunction,
b::ScalarFunctionizeBridge,
)
f = MOIU.canonical(MOI.get(model, attr, b.constraint))
return convert(MOI.SingleVariable, f)
return convert(MOI.SingleVariable, MOI.get(model, attr, b.constraint))
end

# vector version
Expand Down Expand Up @@ -199,6 +206,15 @@ function MOI.set(
return
end

function MOI.get(
model::MOI.ModelLike,
attr::MOI.CanonicalConstraintFunction,
b::VectorFunctionizeBridge,
)
f = MOI.get(model, attr, b.constraint)
return MOIU.convert_approx(MOI.VectorOfVariables, f)
end

function MOI.get(
model::MOI.ModelLike,
attr::MOI.ConstraintFunction,
Expand Down
2 changes: 2 additions & 0 deletions src/Test/test_basic_constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ function _basic_constraint_test_helper(
###
if _supports(config, MOI.ConstraintFunction)
@test MOI.get(model, MOI.ConstraintFunction(), c) ≈ constraint_function
@test MOI.get(model, MOI.CanonicalConstraintFunction(), c) ≈
constraint_function
end
###
### Test MOI.ConstraintSet
Expand Down