Skip to content

[Test] more misc fixes from SCS #1611

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
Sep 15, 2021
Merged

[Test] more misc fixes from SCS #1611

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
d69d6c1
[Test] more misc fixes from SCS
odow Sep 15, 2021
47c932c
Update test_basic_constraint.jl
odow Sep 15, 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
14 changes: 12 additions & 2 deletions src/Bridges/Constraint/geomean.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,19 @@ function MOI.get(
if 2j <= bridge.d
func = MOI.get(model, attr, bridge.rsoc_constraints[offset+j])
func_scalars = MOIU.eachscalar(func)
f_scalars[2j] = func_scalars[1]
# Numerical issues can arise when a VectorOfVariables function
# is turned into a VectorAffineFunction, because the RSOC
# constraints might return something like `0.999999999x` instead
# of exactly `1.0x`. To counteract this, use `convert_approx`.
f_scalars[2j] = MOI.Utilities.convert_approx(
MOI.Utilities.scalar_type(H),
func_scalars[1],
)
if 2j + 1 <= bridge.d
f_scalars[2j+1] = func_scalars[2]
f_scalars[2j+1] = MOI.Utilities.convert_approx(
MOI.Utilities.scalar_type(H),
func_scalars[2],
)
end
end
end
Expand Down
11 changes: 8 additions & 3 deletions src/Test/test_basic_constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,14 @@ function _basic_constraint_test_helper(
### Test MOI.ConstraintFunction
###
if _supports(config, MOI.ConstraintFunction)
@test MOI.get(model, MOI.ConstraintFunction(), c) ≈ constraint_function
@test MOI.get(model, MOI.CanonicalConstraintFunction(), c) ≈
constraint_function
# Don't compare directly, because `f` might not be canonicalized.
f = MOI.get(model, MOI.ConstraintFunction(), c)
@test isapprox(MOI.Utilities.canonical(f), constraint_function, config)
Copy link
Member

Choose a reason for hiding this comment

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

I thought isapprox was canonicalizing already

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm. It might have been the isapprox(0 thing then.

@test isapprox(
MOI.get(model, MOI.CanonicalConstraintFunction(), c),
constraint_function,
config,
)
_test_attribute_value_type(model, MOI.ConstraintFunction(), c)
_test_attribute_value_type(model, MOI.CanonicalConstraintFunction(), c)
end
Expand Down