Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bridges] add Constraint.FunctionConversionBridge #2235

Merged
merged 20 commits into from
Aug 15, 2023
Merged

[Bridges] add Constraint.FunctionConversionBridge #2235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
99f0bc6
[Bridges] simplify AbstractFunctionConversionBridge
odow Jun 29, 2023
68b725f
ToFunctionTypeBridge
blegat Aug 7, 2023
1337c63
Fix format
blegat Aug 7, 2023
b2508ce
Update
odow Aug 7, 2023
f51ef6f
Add docstrings
odow Aug 7, 2023
361f7a2
Update
odow Aug 8, 2023
ad188a0
Fix solver-tests
odow Aug 8, 2023
8f89923
Update
odow Aug 8, 2023
faacdcd
Add bridge cost
blegat Aug 8, 2023
f0107ac
Fix
blegat Aug 8, 2023
000f55f
Fixes
blegat Aug 8, 2023
57aad27
Fixes
blegat Aug 8, 2023
af5da71
Revert name changes
odow Aug 13, 2023
5a1d0bc
Revert to Int weights
odow Aug 13, 2023
961ef6b
Update docstring
odow Aug 14, 2023
44b63a6
Rename cost to bridging_cost
odow Aug 14, 2023
3533cc0
Switch to Float64 edge costs
odow Aug 14, 2023
f7319b7
Update src/Bridges/graph.jl
odow Aug 14, 2023
db6c283
Add explicit test for variable-in-lessthan bridging for conic model
odow Aug 15, 2023
a0637c7
Update tests
odow Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion docs/src/submodules/Bridges/list_of_bridges.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ Bridges.Constraint.ScalarSlackBridge
Bridges.Constraint.VectorSlackBridge
Bridges.Constraint.ScalarFunctionizeBridge
Bridges.Constraint.VectorFunctionizeBridge
Bridges.Constraint.ScalarQuadraticToScalarNonlinearBridge
Bridges.Constraint.ToScalarQuadraticBridge
Bridges.Constraint.ToVectorQuadraticBridge
Bridges.Constraint.ToScalarNonlinearBridge
Bridges.Constraint.FunctionConversionBridge
Bridges.Constraint.SplitComplexEqualToBridge
Bridges.Constraint.SplitComplexZerosBridge
Bridges.Constraint.SplitHyperRectangleBridge
Expand Down
2 changes: 2 additions & 0 deletions docs/src/submodules/Bridges/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ get(::Bridges.AbstractBridge, ::NumberOfConstraints)
get(::Bridges.AbstractBridge, ::ListOfConstraintIndices)
Bridges.needs_final_touch
Bridges.final_touch
Bridges.bridging_cost
```

## Constraint bridge API
Expand All @@ -35,6 +36,7 @@ Bridges.Constraint.add_all_bridges
Bridges.Constraint.FlipSignBridge
Bridges.Constraint.AbstractToIntervalBridge
Bridges.Constraint.SetMapBridge
Bridges.Constraint.conversion_cost
```

## Objective bridge API
Expand Down
7 changes: 3 additions & 4 deletions src/Bridges/Constraint/Constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,9 @@ function add_all_bridges(bridged_model, ::Type{T}) where {T}
MOI.Bridges.add_bridge(bridged_model, VectorSlackBridge{T})
MOI.Bridges.add_bridge(bridged_model, ScalarFunctionizeBridge{T})
MOI.Bridges.add_bridge(bridged_model, VectorFunctionizeBridge{T})
MOI.Bridges.add_bridge(
bridged_model,
ScalarQuadraticToScalarNonlinearBridge{T},
)
MOI.Bridges.add_bridge(bridged_model, ToScalarQuadraticBridge{T})
MOI.Bridges.add_bridge(bridged_model, ToVectorQuadraticBridge{T})
MOI.Bridges.add_bridge(bridged_model, ToScalarNonlinearBridge{T})
MOI.Bridges.add_bridge(bridged_model, SplitHyperRectangleBridge{T})
MOI.Bridges.add_bridge(bridged_model, SplitIntervalBridge{T})
MOI.Bridges.add_bridge(bridged_model, SplitComplexEqualToBridge{T})
Expand Down
Loading
Loading