Skip to content

Commit

Permalink
[Bridges] s/bridged_model/model (#2598)
Browse files Browse the repository at this point in the history
  • Loading branch information
@odow
odow authored Dec 30, 2024
1 parent c3fad29 commit c4cd518
Showing 1 changed file with 71 additions and 77 deletions.
148 changes: 71 additions & 77 deletions src/Bridges/Constraint/Constraint.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,95 +22,89 @@ for filename in readdir(joinpath(@__DIR__, "bridges"); join = true)
end

"""
add_all_bridges(bridged_model, ::Type{T}) where {T}
add_all_bridges(model, ::Type{T}) where {T}
Add all bridges defined in the `Bridges.Constraint` submodule to
`bridged_model`. The coefficient type used is `T`.
Add all bridges defined in the `Bridges.Constraint` submodule to `model`.
The coefficient type used is `T`.
"""
function add_all_bridges(bridged_model, ::Type{T}) where {T}
function add_all_bridges(model, ::Type{T}) where {T}
if T <: AbstractFloat
MOI.Bridges.add_bridge(bridged_model, GreaterToIntervalBridge{T})
MOI.Bridges.add_bridge(bridged_model, LessToIntervalBridge{T})
MOI.Bridges.add_bridge(model, GreaterToIntervalBridge{T})
MOI.Bridges.add_bridge(model, LessToIntervalBridge{T})
end
MOI.Bridges.add_bridge(bridged_model, GreaterToLessBridge{T})
MOI.Bridges.add_bridge(bridged_model, LessToGreaterBridge{T})
MOI.Bridges.add_bridge(bridged_model, NonnegToNonposBridge{T})
MOI.Bridges.add_bridge(bridged_model, NonposToNonnegBridge{T})
MOI.Bridges.add_bridge(bridged_model, ScalarizeBridge{T})
MOI.Bridges.add_bridge(bridged_model, VectorizeBridge{T})
MOI.Bridges.add_bridge(bridged_model, ScalarSlackBridge{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, 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})
MOI.Bridges.add_bridge(bridged_model, SplitComplexZerosBridge{T})
MOI.Bridges.add_bridge(bridged_model, QuadtoSOCBridge{T})
MOI.Bridges.add_bridge(model, GreaterToLessBridge{T})
MOI.Bridges.add_bridge(model, LessToGreaterBridge{T})
MOI.Bridges.add_bridge(model, NonnegToNonposBridge{T})
MOI.Bridges.add_bridge(model, NonposToNonnegBridge{T})
MOI.Bridges.add_bridge(model, ScalarizeBridge{T})
MOI.Bridges.add_bridge(model, VectorizeBridge{T})
MOI.Bridges.add_bridge(model, ScalarSlackBridge{T})
MOI.Bridges.add_bridge(model, VectorSlackBridge{T})
MOI.Bridges.add_bridge(model, ScalarFunctionizeBridge{T})
MOI.Bridges.add_bridge(model, VectorFunctionizeBridge{T})
MOI.Bridges.add_bridge(model, ToScalarQuadraticBridge{T})
MOI.Bridges.add_bridge(model, ToVectorQuadraticBridge{T})
MOI.Bridges.add_bridge(model, ToScalarNonlinearBridge{T})
MOI.Bridges.add_bridge(model, SplitHyperRectangleBridge{T})
MOI.Bridges.add_bridge(model, SplitIntervalBridge{T})
MOI.Bridges.add_bridge(model, SplitComplexEqualToBridge{T})
MOI.Bridges.add_bridge(model, SplitComplexZerosBridge{T})
MOI.Bridges.add_bridge(model, QuadtoSOCBridge{T})
# We do not add `(R)SOCtoNonConvexQuad` because it starts with a convex
# conic constraint and generate a non-convex constraint (in the QCP
# interpretation).
MOI.Bridges.add_bridge(bridged_model, NormInfinityBridge{T})
MOI.Bridges.add_bridge(bridged_model, NormOneBridge{T})
MOI.Bridges.add_bridge(bridged_model, GeoMeantoRelEntrBridge{T})
MOI.Bridges.add_bridge(bridged_model, GeoMeanBridge{T})
MOI.Bridges.add_bridge(bridged_model, GeoMeanToPowerBridge{T})
MOI.Bridges.add_bridge(bridged_model, NormToPowerBridge{T})
MOI.Bridges.add_bridge(bridged_model, NormOneConeToNormConeBridge{T})
MOI.Bridges.add_bridge(bridged_model, SecondOrderConeToNormConeBridge{T})
MOI.Bridges.add_bridge(bridged_model, NormInfinityConeToNormConeBridge{T})
MOI.Bridges.add_bridge(
bridged_model,
ComplexNormInfinityToSecondOrderConeBridge{T},
)
MOI.Bridges.add_bridge(bridged_model, RelativeEntropyBridge{T})
MOI.Bridges.add_bridge(bridged_model, NormSpectralBridge{T})
MOI.Bridges.add_bridge(bridged_model, NormNuclearBridge{T})
MOI.Bridges.add_bridge(bridged_model, HermitianToSymmetricPSDBridge{T})
MOI.Bridges.add_bridge(bridged_model, SquareBridge{T})
MOI.Bridges.add_bridge(bridged_model, SetDotScalingBridge{T})
MOI.Bridges.add_bridge(bridged_model, SetDotInverseScalingBridge{T})
MOI.Bridges.add_bridge(bridged_model, LogDetBridge{T})
MOI.Bridges.add_bridge(bridged_model, RootDetBridge{T})
MOI.Bridges.add_bridge(bridged_model, RSOCtoSOCBridge{T})
MOI.Bridges.add_bridge(bridged_model, SOCtoRSOCBridge{T})
MOI.Bridges.add_bridge(model, NormInfinityBridge{T})
MOI.Bridges.add_bridge(model, NormOneBridge{T})
MOI.Bridges.add_bridge(model, GeoMeantoRelEntrBridge{T})
MOI.Bridges.add_bridge(model, GeoMeanBridge{T})
MOI.Bridges.add_bridge(model, GeoMeanToPowerBridge{T})
MOI.Bridges.add_bridge(model, NormToPowerBridge{T})
MOI.Bridges.add_bridge(model, NormOneConeToNormConeBridge{T})
MOI.Bridges.add_bridge(model, SecondOrderConeToNormConeBridge{T})
MOI.Bridges.add_bridge(model, NormInfinityConeToNormConeBridge{T})
MOI.Bridges.add_bridge(model, ComplexNormInfinityToSecondOrderConeBridge{T})
MOI.Bridges.add_bridge(model, RelativeEntropyBridge{T})
MOI.Bridges.add_bridge(model, NormSpectralBridge{T})
MOI.Bridges.add_bridge(model, NormNuclearBridge{T})
MOI.Bridges.add_bridge(model, HermitianToSymmetricPSDBridge{T})
MOI.Bridges.add_bridge(model, SquareBridge{T})
MOI.Bridges.add_bridge(model, SetDotScalingBridge{T})
MOI.Bridges.add_bridge(model, SetDotInverseScalingBridge{T})
MOI.Bridges.add_bridge(model, LogDetBridge{T})
MOI.Bridges.add_bridge(model, RootDetBridge{T})
MOI.Bridges.add_bridge(model, RSOCtoSOCBridge{T})
MOI.Bridges.add_bridge(model, SOCtoRSOCBridge{T})
# We do not add `SOCtoPSDBridge` as transforming the `SOC` to `RSOC` and
# then to `PSD` produces a smaller SDP constraint.
# MOI.Bridges.add_bridge(bridged_model, SOCtoPSDBridge{T})
MOI.Bridges.add_bridge(bridged_model, RSOCtoPSDBridge{T})
MOI.Bridges.add_bridge(bridged_model, IndicatorActiveOnFalseBridge{T})
MOI.Bridges.add_bridge(bridged_model, IndicatorSOS1Bridge{T})
MOI.Bridges.add_bridge(bridged_model, IndicatorLessToGreaterThanBridge{T})
MOI.Bridges.add_bridge(bridged_model, IndicatorGreaterToLessThanBridge{T})
MOI.Bridges.add_bridge(bridged_model, SemiToBinaryBridge{T})
MOI.Bridges.add_bridge(bridged_model, ZeroOneBridge{T})
MOI.Bridges.add_bridge(bridged_model, IntegerToZeroOneBridge{T})
MOI.Bridges.add_bridge(bridged_model, InequalityToComplementsBridge{T})
# MOI.Bridges.add_bridge(model, SOCtoPSDBridge{T})
MOI.Bridges.add_bridge(model, RSOCtoPSDBridge{T})
MOI.Bridges.add_bridge(model, IndicatorActiveOnFalseBridge{T})
MOI.Bridges.add_bridge(model, IndicatorSOS1Bridge{T})
MOI.Bridges.add_bridge(model, IndicatorLessToGreaterThanBridge{T})
MOI.Bridges.add_bridge(model, IndicatorGreaterToLessThanBridge{T})
MOI.Bridges.add_bridge(model, SemiToBinaryBridge{T})
MOI.Bridges.add_bridge(model, ZeroOneBridge{T})
MOI.Bridges.add_bridge(model, IntegerToZeroOneBridge{T})
MOI.Bridges.add_bridge(model, InequalityToComplementsBridge{T})
# Do not add by default
# MOI.Bridges.add_bridge(bridged_model, NumberConversionBridge{T})
# MOI.Bridges.add_bridge(model, NumberConversionBridge{T})
# Constraint programming bridges
MOI.Bridges.add_bridge(bridged_model, AllDifferentToCountDistinctBridge{T})
MOI.Bridges.add_bridge(
bridged_model,
ReifiedAllDifferentToCountDistinctBridge{T},
)
MOI.Bridges.add_bridge(bridged_model, BinPackingToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, CircuitToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, CountAtLeastToCountBelongsBridge{T})
MOI.Bridges.add_bridge(bridged_model, CountBelongsToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, CountDistinctToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, ReifiedCountDistinctToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, CountGreaterThanToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, TableToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, SOS1ToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, SOS2ToMILPBridge{T})
MOI.Bridges.add_bridge(bridged_model, IndicatorToMILPBridge{T})

MOI.Bridges.add_bridge(model, AllDifferentToCountDistinctBridge{T})
MOI.Bridges.add_bridge(model, ReifiedAllDifferentToCountDistinctBridge{T})
MOI.Bridges.add_bridge(model, BinPackingToMILPBridge{T})
MOI.Bridges.add_bridge(model, CircuitToMILPBridge{T})
MOI.Bridges.add_bridge(model, CountAtLeastToCountBelongsBridge{T})
MOI.Bridges.add_bridge(model, CountBelongsToMILPBridge{T})
MOI.Bridges.add_bridge(model, CountDistinctToMILPBridge{T})
MOI.Bridges.add_bridge(model, ReifiedCountDistinctToMILPBridge{T})
MOI.Bridges.add_bridge(model, CountGreaterThanToMILPBridge{T})
MOI.Bridges.add_bridge(model, TableToMILPBridge{T})
MOI.Bridges.add_bridge(model, SOS1ToMILPBridge{T})
MOI.Bridges.add_bridge(model, SOS2ToMILPBridge{T})
MOI.Bridges.add_bridge(model, IndicatorToMILPBridge{T})
MOI.Bridges.add_bridge(
bridged_model,
model,
ExponentialConeToScalarNonlinearFunctionBridge{T},
)
return
Expand Down

0 comments on commit c4cd518

Please sign in to comment.