From 3163050bd265d9057d90436e16eac978a8a16a56 Mon Sep 17 00:00:00 2001 From: odow Date: Fri, 7 Mar 2025 08:40:54 +1300 Subject: [PATCH] [Test] use SymbolicAD.simplify when comparing ConstraintFunction --- src/Test/test_basic_constraint.jl | 16 ++++++++++------ test/Bridges/Constraint/NormInfinityBridge.jl | 1 + test/Bridges/Constraint/NormOneBridge.jl | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Test/test_basic_constraint.jl b/src/Test/test_basic_constraint.jl index a967861720..e5bfa9b2b9 100644 --- a/src/Test/test_basic_constraint.jl +++ b/src/Test/test_basic_constraint.jl @@ -262,15 +262,19 @@ function _basic_constraint_test_helper( ### ### Test MOI.ConstraintFunction ### + function _isapprox_simplified(f, g, config) + return isapprox( + MOI.Nonlinear.SymbolicAD.simplify(f), + MOI.Nonlinear.SymbolicAD.simplify(g), + config, + ) + end if _supports(config, MOI.ConstraintFunction) # 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) - @test isapprox( - MOI.get(model, MOI.CanonicalConstraintFunction(), c), - constraint_function, - config, - ) + @test _isapprox_simplified(f, constraint_function, config) + cf = MOI.get(model, MOI.CanonicalConstraintFunction(), c) + @test _isapprox_simplified(cf, constraint_function, config) _test_attribute_value_type(model, MOI.ConstraintFunction(), c) _test_attribute_value_type(model, MOI.CanonicalConstraintFunction(), c) _test_function_modification(model, config, c, f) diff --git a/test/Bridges/Constraint/NormInfinityBridge.jl b/test/Bridges/Constraint/NormInfinityBridge.jl index 8cb831cb9f..ebba3f1ad9 100644 --- a/test/Bridges/Constraint/NormInfinityBridge.jl +++ b/test/Bridges/Constraint/NormInfinityBridge.jl @@ -36,6 +36,7 @@ function test_NormInfinity() "test_basic_VectorOfVariables_NormInfinityCone", "test_basic_VectorAffineFunction_NormInfinityCone", "test_basic_VectorQuadraticFunction_NormInfinityCone", + "test_basic_VectorNonlinearFunction_NormInfinityCone", ], ) return diff --git a/test/Bridges/Constraint/NormOneBridge.jl b/test/Bridges/Constraint/NormOneBridge.jl index 1121f93e51..3f480977e8 100644 --- a/test/Bridges/Constraint/NormOneBridge.jl +++ b/test/Bridges/Constraint/NormOneBridge.jl @@ -36,7 +36,7 @@ function test_NormOne() "test_basic_VectorOfVariables_NormOneCone", "test_basic_VectorAffineFunction_NormOneCone", "test_basic_VectorQuadraticFunction_NormOneCone", - # "test_basic_VectorNonlinearFunction_NormOneCone", + "test_basic_VectorNonlinearFunction_NormOneCone", ], ) return