Skip to content

Commit 7a0dd03

Browse files
authored
[Test] use SymbolicAD.simplify when comparing ConstraintFunction (#2686)
1 parent 9ea9a80 commit 7a0dd03

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

src/Test/test_basic_constraint.jl

+10-6
Original file line numberDiff line numberDiff line change
@@ -262,15 +262,19 @@ function _basic_constraint_test_helper(
262262
###
263263
### Test MOI.ConstraintFunction
264264
###
265+
function _isapprox_simplified(f, g, config)
266+
return isapprox(
267+
MOI.Nonlinear.SymbolicAD.simplify(f),
268+
MOI.Nonlinear.SymbolicAD.simplify(g),
269+
config,
270+
)
271+
end
265272
if _supports(config, MOI.ConstraintFunction)
266273
# Don't compare directly, because `f` might not be canonicalized.
267274
f = MOI.get(model, MOI.ConstraintFunction(), c)
268-
@test isapprox(MOI.Utilities.canonical(f), constraint_function, config)
269-
@test isapprox(
270-
MOI.get(model, MOI.CanonicalConstraintFunction(), c),
271-
constraint_function,
272-
config,
273-
)
275+
@test _isapprox_simplified(f, constraint_function, config)
276+
cf = MOI.get(model, MOI.CanonicalConstraintFunction(), c)
277+
@test _isapprox_simplified(cf, constraint_function, config)
274278
_test_attribute_value_type(model, MOI.ConstraintFunction(), c)
275279
_test_attribute_value_type(model, MOI.CanonicalConstraintFunction(), c)
276280
_test_function_modification(model, config, c, f)

test/Bridges/Constraint/NormInfinityBridge.jl

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ function test_NormInfinity()
3636
"test_basic_VectorOfVariables_NormInfinityCone",
3737
"test_basic_VectorAffineFunction_NormInfinityCone",
3838
"test_basic_VectorQuadraticFunction_NormInfinityCone",
39+
"test_basic_VectorNonlinearFunction_NormInfinityCone",
3940
],
4041
)
4142
return

test/Bridges/Constraint/NormOneBridge.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function test_NormOne()
3636
"test_basic_VectorOfVariables_NormOneCone",
3737
"test_basic_VectorAffineFunction_NormOneCone",
3838
"test_basic_VectorQuadraticFunction_NormOneCone",
39-
# "test_basic_VectorNonlinearFunction_NormOneCone",
39+
"test_basic_VectorNonlinearFunction_NormOneCone",
4040
],
4141
)
4242
return

0 commit comments

Comments
 (0)