diff --git a/test/Bridges/Constraint/det.jl b/test/Bridges/Constraint/det.jl index 4c20f33997..2a92e082f8 100644 --- a/test/Bridges/Constraint/det.jl +++ b/test/Bridges/Constraint/det.jl @@ -46,7 +46,7 @@ config = MOIT.Config() }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 5, @@ -118,7 +118,7 @@ config = MOIT.Config() }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, @@ -168,7 +168,7 @@ end }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 4, @@ -239,7 +239,7 @@ end }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, diff --git a/test/Bridges/Constraint/flip_sign.jl b/test/Bridges/Constraint/flip_sign.jl index 24ee6b9f18..0eb19f565f 100644 --- a/test/Bridges/Constraint/flip_sign.jl +++ b/test/Bridges/Constraint/flip_sign.jl @@ -54,7 +54,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) ≈ 2.0 end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -138,7 +138,7 @@ end @test MOI.get(bridged_mock, attr, ci) ≈ 2.0 end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, @@ -179,7 +179,7 @@ end }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -220,7 +220,7 @@ end @test MOI.get(bridged_mock, attr, ci) ≈ [1.0, 2.0] end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -298,7 +298,7 @@ end @test MOI.get(bridged_mock, attr, ci) ≈ [1.0, 2.0] end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, diff --git a/test/Bridges/Constraint/functionize.jl b/test/Bridges/Constraint/functionize.jl index f0a9e43e43..c8d327c132 100644 --- a/test/Bridges/Constraint/functionize.jl +++ b/test/Bridges/Constraint/functionize.jl @@ -26,7 +26,7 @@ config_with_basis = MOIT.Config(basis = true) @test MOI.get(bridged_mock, MOI.ConstraintSet(), ci) == MOI.GreaterThan(0.0) MOI.set(bridged_mock, MOI.ConstraintSet(), ci, MOI.GreaterThan(1.0)) @test MOI.get(bridged_mock, MOI.ConstraintSet(), ci) == MOI.GreaterThan(1.0) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -103,7 +103,7 @@ config_with_basis = MOIT.Config(basis = true) @testset "delete" begin for (i, ci) in enumerate(cis) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -134,7 +134,7 @@ end @test MOI.get(bridged_mock, MOI.ConstraintSet(), ci) == MOI.PowerCone(0.1) MOI.set(bridged_mock, MOI.ConstraintSet(), ci, MOI.PowerCone(0.2)) @test MOI.get(bridged_mock, MOI.ConstraintSet(), ci) == MOI.PowerCone(0.2) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, @@ -192,7 +192,7 @@ end @test MOI.get(bridged_mock, attr, ci) == [1.0, 2.0] end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, diff --git a/test/Bridges/Constraint/geomean.jl b/test/Bridges/Constraint/geomean.jl index e3f76beded..f493fa7e2a 100644 --- a/test/Bridges/Constraint/geomean.jl +++ b/test/Bridges/Constraint/geomean.jl @@ -152,7 +152,7 @@ config = MOIT.Config() }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 4, @@ -342,7 +342,7 @@ config = MOIT.Config() }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 10, @@ -479,7 +479,7 @@ config = MOIT.Config() }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, diff --git a/test/Bridges/Constraint/geomean_to_relentr.jl b/test/Bridges/Constraint/geomean_to_relentr.jl index 4335be5c53..e649a381e6 100644 --- a/test/Bridges/Constraint/geomean_to_relentr.jl +++ b/test/Bridges/Constraint/geomean_to_relentr.jl @@ -163,7 +163,7 @@ config = MOIT.Config() end end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 4, @@ -331,7 +331,7 @@ config = MOIT.Config() end end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 10, @@ -478,7 +478,7 @@ config = MOIT.Config() end end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, diff --git a/test/Bridges/Constraint/indicator_sos.jl b/test/Bridges/Constraint/indicator_sos.jl index 4d1d44066a..da31f34ae4 100644 --- a/test/Bridges/Constraint/indicator_sos.jl +++ b/test/Bridges/Constraint/indicator_sos.jl @@ -258,7 +258,7 @@ end [("w", MOI.LessThan{Float64}(0.0)), ("z", MOI.ZeroOne())], ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, diff --git a/test/Bridges/Constraint/interval.jl b/test/Bridges/Constraint/interval.jl index acb289cf49..0d49f9799e 100644 --- a/test/Bridges/Constraint/interval.jl +++ b/test/Bridges/Constraint/interval.jl @@ -154,7 +154,7 @@ end end end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -188,7 +188,7 @@ end ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -221,7 +221,7 @@ end ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, diff --git a/test/Bridges/Constraint/ltgt_to_interval.jl b/test/Bridges/Constraint/ltgt_to_interval.jl index 44a2bcb7c1..efd5acd9a7 100644 --- a/test/Bridges/Constraint/ltgt_to_interval.jl +++ b/test/Bridges/Constraint/ltgt_to_interval.jl @@ -55,7 +55,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) ≈ 2.0 end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -139,7 +139,7 @@ end @test MOI.get(bridged_mock, attr, ci) ≈ 2.0 end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, diff --git a/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl b/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl index 9170c17425..e0fb4d2319 100644 --- a/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl +++ b/test/Bridges/Constraint/norm_spec_nuc_to_psd.jl @@ -129,7 +129,7 @@ config = MOIT.Config() Float64[4, 0, 4, 0, 0, 4, 1, 1, 0, 4, 1, -1, 1, 0, 4] end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, @@ -293,7 +293,7 @@ end Float64[4, 0, 4, 0, 0, 4, 0.5, 0.5, 0, 4, 0.5, -0.5, 0.5, 0, 4] end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, diff --git a/test/Bridges/Constraint/norm_to_lp.jl b/test/Bridges/Constraint/norm_to_lp.jl index 0daef552e6..1fbfa67d95 100644 --- a/test/Bridges/Constraint/norm_to_lp.jl +++ b/test/Bridges/Constraint/norm_to_lp.jl @@ -163,7 +163,7 @@ config = MOIT.Config() @test MOI.get(mock, attr, nonneg[1]) ≈ nonneg_value end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, @@ -292,7 +292,7 @@ config = MOIT.Config() @test MOI.get(mock, attr, nonneg[1]) ≈ nonneg_value end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 4, @@ -444,7 +444,7 @@ end end end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, @@ -576,7 +576,7 @@ end @test MOI.get(mock, attr, nonneg[1]) ≈ nonneg_value end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 4, diff --git a/test/Bridges/Constraint/quad_to_soc.jl b/test/Bridges/Constraint/quad_to_soc.jl index 52224aa874..a9e4b739a7 100644 --- a/test/Bridges/Constraint/quad_to_soc.jl +++ b/test/Bridges/Constraint/quad_to_soc.jl @@ -116,7 +116,7 @@ config = MOIT.Config() }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, diff --git a/test/Bridges/Constraint/relentr_to_exp.jl b/test/Bridges/Constraint/relentr_to_exp.jl index 8b302dc0cd..a07a19370a 100644 --- a/test/Bridges/Constraint/relentr_to_exp.jl +++ b/test/Bridges/Constraint/relentr_to_exp.jl @@ -149,7 +149,7 @@ config = MOIT.Config() end end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 1, diff --git a/test/Bridges/Constraint/rsoc.jl b/test/Bridges/Constraint/rsoc.jl index 0a5f734ee4..56398f3474 100644 --- a/test/Bridges/Constraint/rsoc.jl +++ b/test/Bridges/Constraint/rsoc.jl @@ -63,7 +63,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) ≈ value end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -129,7 +129,7 @@ end @test MOI.get(bridged_mock, attr, ci) ≈ value end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, diff --git a/test/Bridges/Constraint/scalarize.jl b/test/Bridges/Constraint/scalarize.jl index 98affb722a..de84bac189 100644 --- a/test/Bridges/Constraint/scalarize.jl +++ b/test/Bridges/Constraint/scalarize.jl @@ -45,7 +45,7 @@ config = MOIT.Config() }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, @@ -79,7 +79,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) == values end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -122,7 +122,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) == values end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, @@ -152,7 +152,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) == values end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, diff --git a/test/Bridges/Constraint/semi_to_binary.jl b/test/Bridges/Constraint/semi_to_binary.jl index fcfa9b7eca..24d28b0dfd 100644 --- a/test/Bridges/Constraint/semi_to_binary.jl +++ b/test/Bridges/Constraint/semi_to_binary.jl @@ -75,7 +75,7 @@ config = MOIT.Config() ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -137,7 +137,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) ≈ value end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, diff --git a/test/Bridges/Constraint/slack.jl b/test/Bridges/Constraint/slack.jl index a20c304da2..64453ee4ec 100644 --- a/test/Bridges/Constraint/slack.jl +++ b/test/Bridges/Constraint/slack.jl @@ -56,7 +56,7 @@ config = MOIT.Config() end end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, @@ -205,7 +205,7 @@ end end end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, diff --git a/test/Bridges/Constraint/soc_to_nonconvex_quad.jl b/test/Bridges/Constraint/soc_to_nonconvex_quad.jl index dc16a2bf05..8b5e5479ef 100644 --- a/test/Bridges/Constraint/soc_to_nonconvex_quad.jl +++ b/test/Bridges/Constraint/soc_to_nonconvex_quad.jl @@ -56,7 +56,7 @@ config = MOIT.Config(duals = false) ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 4, @@ -110,7 +110,7 @@ end ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, diff --git a/test/Bridges/Constraint/soc_to_psd.jl b/test/Bridges/Constraint/soc_to_psd.jl index be3ea8c8b4..e1fb2f919e 100644 --- a/test/Bridges/Constraint/soc_to_psd.jl +++ b/test/Bridges/Constraint/soc_to_psd.jl @@ -59,7 +59,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) ≈ value end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, @@ -128,7 +128,7 @@ end @test MOI.get(bridged_mock, attr, ci) ≈ value end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 2, diff --git a/test/Bridges/Constraint/square.jl b/test/Bridges/Constraint/square.jl index 3528070b9a..abb6a59cc5 100644 --- a/test/Bridges/Constraint/square.jl +++ b/test/Bridges/Constraint/square.jl @@ -55,7 +55,7 @@ config = MOIT.Config() }(), ), ) - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 4, diff --git a/test/Bridges/Constraint/vectorize.jl b/test/Bridges/Constraint/vectorize.jl index 3c368344e1..c34e45fc20 100644 --- a/test/Bridges/Constraint/vectorize.jl +++ b/test/Bridges/Constraint/vectorize.jl @@ -120,7 +120,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, attr, ci) == 2.0 end - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 3, diff --git a/test/Bridges/Constraint/zero_one.jl b/test/Bridges/Constraint/zero_one.jl index a63bb4f338..5419046b1c 100644 --- a/test/Bridges/Constraint/zero_one.jl +++ b/test/Bridges/Constraint/zero_one.jl @@ -47,7 +47,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, MOI.ConstraintPrimal(), ci) == 1 - test_delete_bridge( + _test_delete_bridge( bridged_mock, ci, 5, diff --git a/test/Bridges/Objective/functionize.jl b/test/Bridges/Objective/functionize.jl index 7e84a237e7..1f1f90ecdd 100644 --- a/test/Bridges/Objective/functionize.jl +++ b/test/Bridges/Objective/functionize.jl @@ -37,7 +37,7 @@ bridged_mock = MOIB.Objective.Functionize{Float64}(mock) MOI.set(bridged_mock, MOI.ObjectiveSense(), MOI.MAX_SENSE) @test MOI.get(mock, MOI.ObjectiveSense()) == MOI.MAX_SENSE @test MOI.get(bridged_mock, MOI.ObjectiveSense()) == MOI.MAX_SENSE - test_delete_objective(bridged_mock, 1, tuple()) + _test_delete_objective(bridged_mock, 1, tuple()) end # Tests that the `ObjectiveValue` attribute passed has the correct diff --git a/test/Bridges/Objective/slack.jl b/test/Bridges/Objective/slack.jl index 7c39fef6e7..c506755789 100644 --- a/test/Bridges/Objective/slack.jl +++ b/test/Bridges/Objective/slack.jl @@ -193,7 +193,7 @@ end ) end - test_delete_objective( + _test_delete_objective( bridged_mock, 2, ( diff --git a/test/Bridges/Variable/flip_sign.jl b/test/Bridges/Variable/flip_sign.jl index 4f2682146a..bab0b247ac 100644 --- a/test/Bridges/Variable/flip_sign.jl +++ b/test/Bridges/Variable/flip_sign.jl @@ -151,7 +151,7 @@ config = MOIT.Config() @test MOI.get(bridged_mock, MOI.NumberOfVariables()) == 1 vis = MOI.get(bridged_mock, MOI.ListOfVariableIndices()) @test vis == [MOI.VariableIndex(-1)] - test_delete_bridged_variable( + _test_delete_bridged_variable( bridged_mock, vis[1], MOI.Nonpositives, @@ -164,7 +164,7 @@ config = MOIT.Config() MOI.empty!(bridged_mock) vis, ci = MOI.add_constrained_variables(bridged_mock, MOI.Nonpositives(4)) - test_delete_bridged_variable( + _test_delete_bridged_variable( bridged_mock, vis[2], MOI.Nonpositives, diff --git a/test/Bridges/Variable/free.jl b/test/Bridges/Variable/free.jl index a41fc03dcb..ecbe544058 100644 --- a/test/Bridges/Variable/free.jl +++ b/test/Bridges/Variable/free.jl @@ -117,7 +117,7 @@ end @test MOI.get(bridged_mock, MOI.ConstraintPrimal(), cy) == [-100.0] @test MOI.get(bridged_mock, MOI.ConstraintDual(), cy) == [0.0] - test_delete_bridged_variable( + _test_delete_bridged_variable( bridged_mock, vis[1], MOI.Reals, @@ -127,7 +127,7 @@ end (MOI.VectorOfVariables, MOI.Nonpositives, 0), ), ) - test_delete_bridged_variable( + _test_delete_bridged_variable( bridged_mock, vis[2], MOI.Reals, @@ -270,7 +270,7 @@ end MOIU.test_models_equal(bridged_mock, model, var_names, ["c1", "c2"]) end - test_delete_bridged_variable( + _test_delete_bridged_variable( bridged_mock, vis[1], MOI.Reals, @@ -282,7 +282,7 @@ end used_bridges = 0, used_constraints = 0, ) - test_delete_bridged_variable( + _test_delete_bridged_variable( bridged_mock, vis[2], MOI.Reals, diff --git a/test/Bridges/Variable/rsoc_to_psd.jl b/test/Bridges/Variable/rsoc_to_psd.jl index ac01f33cc1..a83e18a5f5 100644 --- a/test/Bridges/Variable/rsoc_to_psd.jl +++ b/test/Bridges/Variable/rsoc_to_psd.jl @@ -96,7 +96,7 @@ bridged_mock = MOIB.Variable.RSOCtoPSD{Float64}(mock) MOIU.test_models_equal(bridged_mock, model, var_names, ["cxy", "c"]) end - test_delete_bridged_variables( + _test_delete_bridged_variables( bridged_mock, xy, MOI.RotatedSecondOrderCone, @@ -242,7 +242,7 @@ end @test_throws err MOI.delete(bridged_mock, v[i]) end - test_delete_bridged_variables( + _test_delete_bridged_variables( bridged_mock, v, MOI.RotatedSecondOrderCone, diff --git a/test/Bridges/Variable/rsoc_to_soc.jl b/test/Bridges/Variable/rsoc_to_soc.jl index 5bb00bdb3f..0baf0b5de7 100644 --- a/test/Bridges/Variable/rsoc_to_soc.jl +++ b/test/Bridges/Variable/rsoc_to_soc.jl @@ -104,7 +104,7 @@ bridged_mock = MOIB.Variable.RSOCtoSOC{Float64}(mock) @test_throws err MOI.delete(bridged_mock, tuxy[i]) end - test_delete_bridged_variables( + _test_delete_bridged_variables( bridged_mock, tuxy, MOI.RotatedSecondOrderCone, diff --git a/test/Bridges/Variable/soc_to_rsoc.jl b/test/Bridges/Variable/soc_to_rsoc.jl index c15138b2e6..248929a97e 100644 --- a/test/Bridges/Variable/soc_to_rsoc.jl +++ b/test/Bridges/Variable/soc_to_rsoc.jl @@ -103,7 +103,7 @@ bridged_mock = MOIB.Variable.SOCtoRSOC{Float64}(mock) @test_throws err MOI.delete(bridged_mock, xyz[i]) end - test_delete_bridged_variables( + _test_delete_bridged_variables( bridged_mock, xyz, MOI.SecondOrderCone, diff --git a/test/Bridges/Variable/vectorize.jl b/test/Bridges/Variable/vectorize.jl index c12ad8765f..d803f6c6ef 100644 --- a/test/Bridges/Variable/vectorize.jl +++ b/test/Bridges/Variable/vectorize.jl @@ -236,7 +236,7 @@ end @test MOI.get(mock, MOI.VariablePrimalStart(), z) == -4 @test MOI.get(bridged_mock, MOI.VariablePrimalStart(), y) == 1 - test_delete_bridged_variable( + _test_delete_bridged_variable( bridged_mock, y, MOI.LessThan{Float64}, diff --git a/test/Bridges/Variable/zeros.jl b/test/Bridges/Variable/zeros.jl index e910e6e0a5..b6049968b2 100644 --- a/test/Bridges/Variable/zeros.jl +++ b/test/Bridges/Variable/zeros.jl @@ -171,7 +171,7 @@ end end @testset "Delete" begin - test_delete_bridged_variables( + _test_delete_bridged_variables( bridged_mock, yz, MOI.Zeros, diff --git a/test/Bridges/bridge_optimizer.jl b/test/Bridges/bridge_optimizer.jl index 3535bde62e..320f7cd01a 100644 --- a/test/Bridges/bridge_optimizer.jl +++ b/test/Bridges/bridge_optimizer.jl @@ -256,13 +256,13 @@ end @test MOI.get(model, MOI.ListOfConstraintTypesPresent()) == [(MOI.ScalarAffineFunction{Int}, MOI.Interval{Int})] - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}, 0, ) - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}, @@ -283,13 +283,13 @@ end (MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}), (MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}), ] - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}, 1, ) - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}, @@ -323,19 +323,19 @@ end (MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}), (MOI.SingleVariable, MOI.Interval{Int}), ]) - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}, 1, ) - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}, 1, ) - test_num_constraints(model, MOI.SingleVariable, MOI.Interval{Int}, i) + _test_num_constraints(model, MOI.SingleVariable, MOI.Interval{Int}, i) @test (@inferred MOI.get( model, MOI.ListOfConstraintIndices{ @@ -369,25 +369,25 @@ end (MOI.SingleVariable, MOI.Interval{Int}), (MOI.VectorOfVariables, MOI.Nonnegatives), ]) - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}, 1, ) - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}, 1, ) - test_num_constraints( + _test_num_constraints( model, MOI.SingleVariable, MOI.Interval{Int}, n + 2, ) - test_num_constraints(model, MOI.VectorOfVariables, MOI.Nonnegatives, i) + _test_num_constraints(model, MOI.VectorOfVariables, MOI.Nonnegatives, i) @test (@inferred MOI.get( model, MOI.ListOfConstraintIndices{ @@ -424,20 +424,20 @@ end (MOI.SingleVariable, MOI.Interval{Int}), (MOI.VectorOfVariables, MOI.Nonnegatives), ]) - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.GreaterThan{Int}, 0, ) - test_num_constraints( + _test_num_constraints( model, MOI.ScalarAffineFunction{Int}, MOI.Interval{Int}, 1, ) - test_num_constraints(model, MOI.SingleVariable, MOI.Interval{Int}, n + 2) - test_num_constraints(model, MOI.VectorOfVariables, MOI.Nonnegatives, n) + _test_num_constraints(model, MOI.SingleVariable, MOI.Interval{Int}, n + 2) + _test_num_constraints(model, MOI.VectorOfVariables, MOI.Nonnegatives, n) @test (@inferred MOI.get( model, MOI.ListOfConstraintIndices{ diff --git a/test/Bridges/lazy_bridge_optimizer.jl b/test/Bridges/lazy_bridge_optimizer.jl index 75aae3b4bb..1973e5e0c5 100644 --- a/test/Bridges/lazy_bridge_optimizer.jl +++ b/test/Bridges/lazy_bridge_optimizer.jl @@ -639,7 +639,7 @@ end end @testset "Combining two briges" begin x, cx = MOI.add_constrained_variable(bridged, MOI.LessThan(one(T))) - test_delete_bridged_variable( + _test_delete_bridged_variable( bridged, x, MOI.LessThan{T}, @@ -1431,7 +1431,7 @@ end MOI.delete(bridged, y) @test MOI.get(bridged, MOI.NumberOfVariables()) == 4 @test !MOI.is_valid(bridged, y) - test_delete_bridged_variables( + _test_delete_bridged_variables( bridged, x, MOI.RotatedSecondOrderCone, diff --git a/test/Bridges/utilities.jl b/test/Bridges/utilities.jl index 6abe198b76..c05c00c552 100644 --- a/test/Bridges/utilities.jl +++ b/test/Bridges/utilities.jl @@ -1,45 +1,56 @@ -function test_num_constraints(bridged_mock, F, S, n) +function _test_num_constraints(bridged_mock, F, S, n) @test MOI.get(bridged_mock, MOI.NumberOfConstraints{F,S}()) == n @test length(MOI.get(bridged_mock, MOI.ListOfConstraintIndices{F,S}())) == n - @test ( - (F, S) in MOI.get(bridged_mock, MOI.ListOfConstraintTypesPresent()) - ) == !iszero(n) + ret = (F, S) in MOI.get(bridged_mock, MOI.ListOfConstraintTypesPresent()) + @test ret == !iszero(n) + return end -function warn_incomplete_list_num_constraints(BT, list_num_constraints) +function _warn_incomplete_list_num_constraints(BT, list_num_constraints) for (S,) in MOIB.added_constrained_variable_types(BT) F = MOIU.variable_function_type(S) if !any(c -> c[1] == F && c[2] == S, list_num_constraints) error( - "Bridges of type $BT add constrained variable in $S but their number is not tested.", + "Bridges of type $BT add constrained variable in $S but " * + "their number is not tested.", ) end end for (F, S) in MOIB.added_constraint_types(BT) if !any(c -> c[1] == F && c[2] == S, list_num_constraints) error( - "Bridges of type $BT add $F-in-$S constraints but their number is not tested.", + "Bridges of type $BT add $F-in-$S constraints but their " * + "number is not tested.", ) end end + return end """ - test_delete_bridge( - m::MOIB.AbstractBridgeOptimizer, ci::MOI.ConstraintIndex{F, S}, nvars::Int, - list_num_constraints::Tuple; used_bridges = 1, num_bridged = 1) where {F, S} + _test_delete_bridge( + m::MOIB.AbstractBridgeOptimizer, + ci::MOI.ConstraintIndex{F, S}, + nvars::Int, + list_num_constraints::Tuple; + used_bridges = 1, + num_bridged = 1, + ) where {F, S} Test deletion of the constraint `ci` in model `m`. -* The number of variables added in `m` is `nvars` (ignoring the variables added by the bridges). -* For each `(Fi, Si, n)` in `list_num_constraints`, the number of `Fi`-in-`Si` constraints added - to `m` is `n` (ignoring the constraints added by the bridges). - All constraint types added by the bridge bridging `ci` should appear in `list_num_constraints`. - Otherwise a error is thrown to ensure good test coverage. -* The number of bridges that will be deleted when deleted `ci` is `used_bridges`. +* The number of variables added in `m` is `nvars` (ignoring the variables added + by the bridges). +* For each `(Fi, Si, n)` in `list_num_constraints`, the number of `Fi`-in-`Si` + constraints added to `m` is `n` (ignoring the constraints added by the + bridges). All constraint types added by the bridge bridging `ci` should appear + in `list_num_constraints`. Otherwise a error is thrown to ensure good test + coverage. +* The number of bridges that will be deleted when deleted `ci` is + `used_bridges`. * The number of `F`-in-`S` constraints is `num_bridged`. """ -function test_delete_bridge( +function _test_delete_bridge( m::MOIB.AbstractBridgeOptimizer, ci::MOI.ConstraintIndex{F,S}, nvars::Int, @@ -47,7 +58,7 @@ function test_delete_bridge( used_bridges = 1, num_bridged = 1, ) where {F,S} - warn_incomplete_list_num_constraints( + _warn_incomplete_list_num_constraints( typeof(MOIB.bridge(m, ci)), list_num_constraints, ) @@ -57,25 +68,28 @@ function test_delete_bridge( start_num_bridges = num_bridges() @test MOI.get(m, MOI.NumberOfVariables()) == nvars @test length(MOI.get(m, MOI.ListOfVariableIndices())) == nvars - test_num_constraints(m, F, S, num_bridged) + _test_num_constraints(m, F, S, num_bridged) for num_constraints in list_num_constraints - test_num_constraints(m, num_constraints...) + _test_num_constraints(m, num_constraints...) end @test MOI.is_valid(m, ci) MOI.delete(m, ci) @test_throws MOI.InvalidIndex(ci) MOI.delete(m, ci) @test !MOI.is_valid(m, ci) @test num_bridges() == start_num_bridges - used_bridges - test_num_constraints(m, F, S, num_bridged - 1) - # As the bridge has been removed, if the constraints it has created were not removed, it wouldn't be there to decrease this counter anymore + _test_num_constraints(m, F, S, num_bridged - 1) + # As the bridge has been removed, if the constraints it has created were not + # removed, it wouldn't be there to decrease this counter anymore. @test MOI.get(m, MOI.NumberOfVariables()) == nvars @test length(MOI.get(m, MOI.ListOfVariableIndices())) == nvars for num_constraints in list_num_constraints - test_num_constraints(m, num_constraints...) + _test_num_constraints(m, num_constraints...) end + return end + # Test deletion of variable bridge used for variable `vi` -function test_delete_bridged_variable( +function _test_delete_bridged_variable( m::MOIB.AbstractBridgeOptimizer, vi::MOI.VariableIndex, S::Type, @@ -85,7 +99,7 @@ function test_delete_bridged_variable( num_bridged = 1, used_constraints = 1, ) - warn_incomplete_list_num_constraints( + _warn_incomplete_list_num_constraints( typeof(MOIB.bridge(m, vi)), list_num_constraints, ) @@ -99,10 +113,10 @@ function test_delete_bridged_variable( F = S <: MOI.AbstractScalarSet ? MOI.SingleVariable : MOI.VectorOfVariables - test_num_constraints(m, F, S, num_bridged) + _test_num_constraints(m, F, S, num_bridged) end for num_constraints in list_num_constraints - test_num_constraints(m, num_constraints...) + _test_num_constraints(m, num_constraints...) end @test MOI.is_valid(m, vi) MOI.delete(m, vi) @@ -110,16 +124,18 @@ function test_delete_bridged_variable( @test !MOI.is_valid(m, vi) @test num_bridges() == start_num_bridges - used_bridges if S != MOI.Reals - test_num_constraints(m, F, S, num_bridged - used_constraints) + _test_num_constraints(m, F, S, num_bridged - used_constraints) end @test MOI.get(m, MOI.NumberOfVariables()) == nvars - 1 @test length(MOI.get(m, MOI.ListOfVariableIndices())) == nvars - 1 for num_constraints in list_num_constraints - test_num_constraints(m, num_constraints...) + _test_num_constraints(m, num_constraints...) end + return end + # Test deletion of variable bridge used for vector of variables `vis` -function test_delete_bridged_variables( +function _test_delete_bridged_variables( m::MOIB.AbstractBridgeOptimizer, vis::Vector{MOI.VariableIndex}, S::Type, @@ -128,7 +144,7 @@ function test_delete_bridged_variables( used_bridges = 1, num_bridged = 1, ) - warn_incomplete_list_num_constraints( + _warn_incomplete_list_num_constraints( typeof(MOIB.bridge(m, vis[1])), list_num_constraints, ) @@ -142,10 +158,10 @@ function test_delete_bridged_variables( F = S <: MOI.AbstractScalarSet ? MOI.SingleVariable : MOI.VectorOfVariables - test_num_constraints(m, F, S, num_bridged) + _test_num_constraints(m, F, S, num_bridged) end for num_constraints in list_num_constraints - test_num_constraints(m, num_constraints...) + _test_num_constraints(m, num_constraints...) end @test all(vi -> MOI.is_valid(m, vi), vis) MOI.delete(m, vis) @@ -153,21 +169,23 @@ function test_delete_bridged_variables( @test all(vi -> !MOI.is_valid(m, vi), vis) @test num_bridges() == start_num_bridges - used_bridges if S != MOI.Reals - test_num_constraints(m, F, S, num_bridged - 1) + _test_num_constraints(m, F, S, num_bridged - 1) end @test MOI.get(m, MOI.NumberOfVariables()) == nvars - length(vis) @test length(MOI.get(m, MOI.ListOfVariableIndices())) == nvars - length(vis) for num_constraints in list_num_constraints - test_num_constraints(m, num_constraints...) + _test_num_constraints(m, num_constraints...) end + return end -function test_delete_objective( + +function _test_delete_objective( m::MOIB.AbstractBridgeOptimizer, nvars::Int, list_num_constraints::Tuple; used_bridges = 1, ) - warn_incomplete_list_num_constraints( + _warn_incomplete_list_num_constraints( typeof(MOIB.Objective.root_bridge(MOIB.Objective.bridges(m))), list_num_constraints, ) @@ -178,7 +196,7 @@ function test_delete_objective( @test MOI.get(m, MOI.NumberOfVariables()) == nvars @test length(MOI.get(m, MOI.ListOfVariableIndices())) == nvars for num_constraints in list_num_constraints - test_num_constraints(m, num_constraints...) + _test_num_constraints(m, num_constraints...) end MOI.set(m, MOI.ObjectiveSense(), MOI.FEASIBILITY_SENSE) @test MOI.get(m, MOI.ObjectiveSense()) == MOI.FEASIBILITY_SENSE @@ -186,6 +204,7 @@ function test_delete_objective( @test MOI.get(m, MOI.NumberOfVariables()) == nvars @test length(MOI.get(m, MOI.ListOfVariableIndices())) == nvars for num_constraints in list_num_constraints - test_num_constraints(m, num_constraints...) + _test_num_constraints(m, num_constraints...) end + return end