Skip to content

Commit 8c7fbbf

Browse files
odowblegat
andauthored
[Bridges] add bridging_cost and Constraint.FunctionConversionBridge (#2235)
Co-authored-by: Benoît Legat <[email protected]>
1 parent 80bd736 commit 8c7fbbf

File tree

12 files changed

+530
-276
lines changed

12 files changed

+530
-276
lines changed

docs/src/submodules/Bridges/list_of_bridges.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ Bridges.Constraint.ScalarSlackBridge
2828
Bridges.Constraint.VectorSlackBridge
2929
Bridges.Constraint.ScalarFunctionizeBridge
3030
Bridges.Constraint.VectorFunctionizeBridge
31-
Bridges.Constraint.ScalarQuadraticToScalarNonlinearBridge
31+
Bridges.Constraint.ToScalarQuadraticBridge
32+
Bridges.Constraint.ToVectorQuadraticBridge
33+
Bridges.Constraint.ToScalarNonlinearBridge
34+
Bridges.Constraint.FunctionConversionBridge
3235
Bridges.Constraint.SplitComplexEqualToBridge
3336
Bridges.Constraint.SplitComplexZerosBridge
3437
Bridges.Constraint.SplitHyperRectangleBridge

docs/src/submodules/Bridges/reference.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ get(::Bridges.AbstractBridge, ::NumberOfConstraints)
2020
get(::Bridges.AbstractBridge, ::ListOfConstraintIndices)
2121
Bridges.needs_final_touch
2222
Bridges.final_touch
23+
Bridges.bridging_cost
2324
```
2425

2526
## Constraint bridge API
@@ -35,6 +36,7 @@ Bridges.Constraint.add_all_bridges
3536
Bridges.Constraint.FlipSignBridge
3637
Bridges.Constraint.AbstractToIntervalBridge
3738
Bridges.Constraint.SetMapBridge
39+
Bridges.Constraint.conversion_cost
3840
```
3941

4042
## Objective bridge API

src/Bridges/Constraint/Constraint.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,9 @@ function add_all_bridges(bridged_model, ::Type{T}) where {T}
8484
MOI.Bridges.add_bridge(bridged_model, VectorSlackBridge{T})
8585
MOI.Bridges.add_bridge(bridged_model, ScalarFunctionizeBridge{T})
8686
MOI.Bridges.add_bridge(bridged_model, VectorFunctionizeBridge{T})
87-
MOI.Bridges.add_bridge(
88-
bridged_model,
89-
ScalarQuadraticToScalarNonlinearBridge{T},
90-
)
87+
MOI.Bridges.add_bridge(bridged_model, ToScalarQuadraticBridge{T})
88+
MOI.Bridges.add_bridge(bridged_model, ToVectorQuadraticBridge{T})
89+
MOI.Bridges.add_bridge(bridged_model, ToScalarNonlinearBridge{T})
9190
MOI.Bridges.add_bridge(bridged_model, SplitHyperRectangleBridge{T})
9291
MOI.Bridges.add_bridge(bridged_model, SplitIntervalBridge{T})
9392
MOI.Bridges.add_bridge(bridged_model, SplitComplexEqualToBridge{T})

0 commit comments

Comments
 (0)