Skip to content

Commit a8bb0bd

Browse files
committed
Fix
1 parent 514c8b6 commit a8bb0bd

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

test/Bridges/General/test_lazy_bridge_optimizer.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,14 +1150,14 @@ Objective function of type `MOI.ScalarQuadraticFunction{$T}` is not supported an
11501150
"""
11511151
Bridge graph with 2 variable nodes, 5 constraint nodes and 2 objective nodes.
11521152
[1] constrained variables in `MOI.Reals` are bridged (distance 1) by $(MOI.Bridges.Variable.FreeBridge{T}).
1153-
[2] constrained variables in `MOI.RotatedSecondOrderCone` are bridged (distance 11) by $(MOI.Bridges.Variable.RSOCtoPSDBridge{T}).
1154-
(1) `MOI.ScalarQuadraticFunction{$T}`-in-`MOI.GreaterThan{$T}` constraints are bridged (distance 14) by $(MOI.Bridges.Constraint.QuadtoSOCBridge{T}).
1155-
(2) `MOI.VectorAffineFunction{$T}`-in-`MOI.RotatedSecondOrderCone` constraints are bridged (distance 13) by $(MOI.Bridges.Constraint.VectorSlackBridge{T,MOI.VectorAffineFunction{T},MOI.RotatedSecondOrderCone}).
1156-
(3) `MOI.VariableIndex`-in-`MOI.EqualTo{$T}` constraints are bridged (distance 1) by $(MOI.Bridges.Constraint.ScalarFunctionizeBridge{T,MOI.EqualTo{T}}).
1153+
[2] constrained variables in `MOI.RotatedSecondOrderCone` are bridged (distance 10.5) by $(MOI.Bridges.Variable.RSOCtoPSDBridge{T}).
1154+
(1) `MOI.ScalarQuadraticFunction{$T}`-in-`MOI.GreaterThan{$T}` constraints are bridged (distance 13.5) by $(MOI.Bridges.Constraint.QuadtoSOCBridge{T}).
1155+
(2) `MOI.VectorAffineFunction{$T}`-in-`MOI.RotatedSecondOrderCone` constraints are bridged (distance 12.5) by $(MOI.Bridges.Constraint.VectorSlackBridge{T,MOI.VectorAffineFunction{T},MOI.RotatedSecondOrderCone}).
1156+
(3) `MOI.VariableIndex`-in-`MOI.EqualTo{$T}` constraints are bridged (distance 0.5) by $(MOI.Bridges.Constraint.ScalarFunctionizeBridge{T,MOI.EqualTo{T}}).
11571157
(4) `MOI.VectorAffineFunction{$T}`-in-`MOI.Zeros` constraints are bridged (distance 1) by $(MOI.Bridges.Constraint.ScalarizeBridge{T,MOI.ScalarAffineFunction{T},MOI.EqualTo{T}}).
1158-
(5) `MOI.ScalarQuadraticFunction{$T}`-in-`MOI.LessThan{$T}` constraints are bridged (distance 14) by $(MOI.Bridges.Constraint.QuadtoSOCBridge{T}).
1159-
|1| objective function of type `MOI.ScalarQuadraticFunction{$T}` is bridged (distance 31) by $(MOI.Bridges.Objective.SlackBridge{T,MOI.ScalarQuadraticFunction{T},MOI.ScalarQuadraticFunction{T}}).
1160-
|2| objective function of type `MOI.VariableIndex` is bridged (distance 1) by $(MOI.Bridges.Objective.FunctionizeBridge{T,MOI.VariableIndex}).
1158+
(5) `MOI.ScalarQuadraticFunction{$T}`-in-`MOI.LessThan{$T}` constraints are bridged (distance 13.5) by $(MOI.Bridges.Constraint.QuadtoSOCBridge{T}).
1159+
|1| objective function of type `MOI.ScalarQuadraticFunction{$T}` is bridged (distance 29.5) by $(MOI.Bridges.Objective.SlackBridge{T,MOI.ScalarQuadraticFunction{T},MOI.ScalarQuadraticFunction{T}}).
1160+
|2| objective function of type `MOI.VariableIndex` is bridged (distance 0.5) by $(MOI.Bridges.Objective.FunctionizeBridge{T,MOI.VariableIndex}).
11611161
""",
11621162
)
11631163
end

test/Utilities/test_copy.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ function test_create_variables_using_supports_add_constrained_variable()
503503
@test MOI.get(
504504
bridged_dest,
505505
MOI.ConstraintBridgingCost{MOI.VectorOfVariables,MOI.Nonpositives}(),
506-
) == 1.0
506+
) == 0.5
507507
@test MOI.supports_add_constrained_variables(bridged_dest, MOI.Zeros)
508508
@test MOI.get(bridged_dest, MOI.VariableBridgingCost{MOI.Zeros}()) == 1.0
509509
@test MOI.supports_constraint(
@@ -514,7 +514,7 @@ function test_create_variables_using_supports_add_constrained_variable()
514514
@test MOI.get(
515515
bridged_dest,
516516
MOI.ConstraintBridgingCost{MOI.VectorOfVariables,MOI.Zeros}(),
517-
) == 3.0
517+
) == 2.5
518518
index_map = MOI.copy_to(bridged_dest, src)
519519
@test length(dest.constraintIndices) == 6
520520

0 commit comments

Comments
 (0)