Skip to content

Commit 230c9f3

Browse files
odowodow
authored
Use JuliaFormatter to format /src/Bridges (jump-dev#1212)
1 parent 1937e27 commit 230c9f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+4827
-2086
lines changed

‎src/Bridges/Bridges.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ function print_num_bridges(io::IO, B::Variable.Map)
4040
s(n) = n == 1 ? "" : "s"
4141
indent = " "^get(io, :indent, 0)
4242
n = length(B)
43-
print(io, "\n$(indent)with $(n) variable bridge$(s(n))")
43+
return print(io, "\n$(indent)with $(n) variable bridge$(s(n))")
4444
end
4545
function print_num_bridges(io::IO, B::Constraint.Map)
4646
s(n) = n == 1 ? "" : "s"
4747
indent = " "^get(io, :indent, 0)
4848
n = length(B)
49-
print(io, "\n$(indent)with $(n) constraint bridge$(s(n))")
49+
return print(io, "\n$(indent)with $(n) constraint bridge$(s(n))")
5050
end
5151
function print_num_bridges(io::IO, B::Objective.Map)
5252
s(n) = n == 1 ? "" : "s"
5353
indent = " "^get(io, :indent, 0)
5454
n = length(B)
55-
print(io, "\n$(indent)with $(n) objective bridge$(s(n))")
55+
return print(io, "\n$(indent)with $(n) objective bridge$(s(n))")
5656
end
5757

5858
function Base.show(io::IO, B::AbstractBridgeOptimizer)
@@ -63,7 +63,7 @@ function Base.show(io::IO, B::AbstractBridgeOptimizer)
6363
if :model in propertynames(B)
6464
indent = " "^get(io, :indent, 0)
6565
print(io, "\n$(indent)with inner model ")
66-
show(IOContext(io, :indent => get(io, :indent, 0)+2), B.model)
66+
show(IOContext(io, :indent => get(io, :indent, 0) + 2), B.model)
6767
end
6868
end
6969

‎src/Bridges/Constraint/Constraint.jl‎

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include("single_bridge_optimizer.jl")
2323
# method seemed necessary to fix it.
2424
# See https://github.com/JuliaLang/julia/issues/32167 for more.
2525
function MOI.Bridges.Constraint.bridge_constraint(BridgeType, b, f, s)
26-
throw(MOI.UnsupportedConstraint{typeof(f), typeof(s)}())
26+
return throw(MOI.UnsupportedConstraint{typeof(f),typeof(s)}())
2727
end
2828

2929
# Constraint bridges
@@ -33,46 +33,63 @@ include("function_conversion.jl")
3333
include("set_map.jl")
3434

3535
include("vectorize.jl")
36-
const Vectorize{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{VectorizeBridge{T}, OT}
36+
const Vectorize{T,OT<:MOI.ModelLike} =
37+
SingleBridgeOptimizer{VectorizeBridge{T},OT}
3738
include("scalarize.jl")
38-
const Scalarize{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{ScalarizeBridge{T}, OT}
39+
const Scalarize{T,OT<:MOI.ModelLike} =
40+
SingleBridgeOptimizer{ScalarizeBridge{T},OT}
3941
include("slack.jl")
40-
const ScalarSlack{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{ScalarSlackBridge{T}, OT}
41-
const VectorSlack{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{VectorSlackBridge{T}, OT}
42+
const ScalarSlack{T,OT<:MOI.ModelLike} =
43+
SingleBridgeOptimizer{ScalarSlackBridge{T},OT}
44+
const VectorSlack{T,OT<:MOI.ModelLike} =
45+
SingleBridgeOptimizer{VectorSlackBridge{T},OT}
4246
include("interval.jl")
43-
const SplitInterval{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{SplitIntervalBridge{T}, OT}
47+
const SplitInterval{T,OT<:MOI.ModelLike} =
48+
SingleBridgeOptimizer{SplitIntervalBridge{T},OT}
4449
include("quad_to_soc.jl")
45-
const QuadtoSOC{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{QuadtoSOCBridge{T}, OT}
50+
const QuadtoSOC{T,OT<:MOI.ModelLike} =
51+
SingleBridgeOptimizer{QuadtoSOCBridge{T},OT}
4652
include("soc_to_nonconvex_quad.jl") # do not add these bridges by default
47-
const SOCtoNonConvexQuad{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{SOCtoNonConvexQuadBridge{T}, OT}
48-
const RSOCtoNonConvexQuad{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{RSOCtoNonConvexQuadBridge{T}, OT}
53+
const SOCtoNonConvexQuad{T,OT<:MOI.ModelLike} =
54+
SingleBridgeOptimizer{SOCtoNonConvexQuadBridge{T},OT}
55+
const RSOCtoNonConvexQuad{T,OT<:MOI.ModelLike} =
56+
SingleBridgeOptimizer{RSOCtoNonConvexQuadBridge{T},OT}
4957
include("norm_to_lp.jl")
50-
const NormInfinity{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{NormInfinityBridge{T}, OT}
51-
const NormOne{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{NormOneBridge{T}, OT}
58+
const NormInfinity{T,OT<:MOI.ModelLike} =
59+
SingleBridgeOptimizer{NormInfinityBridge{T},OT}
60+
const NormOne{T,OT<:MOI.ModelLike} = SingleBridgeOptimizer{NormOneBridge{T},OT}
5261
include("geomean_to_relentr.jl")
53-
const GeoMeantoRelEntr{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{GeoMeantoRelEntrBridge{T}, OT}
62+
const GeoMeantoRelEntr{T,OT<:MOI.ModelLike} =
63+
SingleBridgeOptimizer{GeoMeantoRelEntrBridge{T},OT}
5464
include("geomean.jl")
55-
const GeoMean{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{GeoMeanBridge{T}, OT}
65+
const GeoMean{T,OT<:MOI.ModelLike} = SingleBridgeOptimizer{GeoMeanBridge{T},OT}
5666
include("relentr_to_exp.jl")
57-
const RelativeEntropy{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{RelativeEntropyBridge{T}, OT}
67+
const RelativeEntropy{T,OT<:MOI.ModelLike} =
68+
SingleBridgeOptimizer{RelativeEntropyBridge{T},OT}
5869
include("norm_spec_nuc_to_psd.jl")
59-
const NormSpectral{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{NormSpectralBridge{T}, OT}
60-
const NormNuclear{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{NormNuclearBridge{T}, OT}
70+
const NormSpectral{T,OT<:MOI.ModelLike} =
71+
SingleBridgeOptimizer{NormSpectralBridge{T},OT}
72+
const NormNuclear{T,OT<:MOI.ModelLike} =
73+
SingleBridgeOptimizer{NormNuclearBridge{T},OT}
6174
include("square.jl")
62-
const Square{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{SquareBridge{T}, OT}
75+
const Square{T,OT<:MOI.ModelLike} = SingleBridgeOptimizer{SquareBridge{T},OT}
6376
include("det.jl")
64-
const LogDet{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{LogDetBridge{T}, OT}
65-
const RootDet{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{RootDetBridge{T}, OT}
77+
const LogDet{T,OT<:MOI.ModelLike} = SingleBridgeOptimizer{LogDetBridge{T},OT}
78+
const RootDet{T,OT<:MOI.ModelLike} = SingleBridgeOptimizer{RootDetBridge{T},OT}
6679
include("soc_to_psd.jl")
67-
const SOCtoPSD{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{SOCtoPSDBridge{T}, OT}
68-
const RSOCtoPSD{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{RSOCtoPSDBridge{T}, OT}
80+
const SOCtoPSD{T,OT<:MOI.ModelLike} =
81+
SingleBridgeOptimizer{SOCtoPSDBridge{T},OT}
82+
const RSOCtoPSD{T,OT<:MOI.ModelLike} =
83+
SingleBridgeOptimizer{RSOCtoPSDBridge{T},OT}
6984
include("indicator_activate_on_zero.jl")
7085
include("indicator_sos.jl")
71-
const IndicatortoSOS1{T, BC <: MOI.AbstractScalarSet, MaybeBC} = SingleBridgeOptimizer{IndicatorSOS1Bridge{T, BC, MaybeBC}}
86+
const IndicatortoSOS1{T,BC<:MOI.AbstractScalarSet,MaybeBC} =
87+
SingleBridgeOptimizer{IndicatorSOS1Bridge{T,BC,MaybeBC}}
7288
include("semi_to_binary.jl")
73-
const SemiToBinary{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{SemiToBinaryBridge{T}, OT}
89+
const SemiToBinary{T,OT<:MOI.ModelLike} =
90+
SingleBridgeOptimizer{SemiToBinaryBridge{T},OT}
7491
include("zero_one.jl")
75-
const ZeroOne{T, OT<:MOI.ModelLike} = SingleBridgeOptimizer{ZeroOneBridge{T}, OT}
92+
const ZeroOne{T,OT<:MOI.ModelLike} = SingleBridgeOptimizer{ZeroOneBridge{T},OT}
7693

7794
"""
7895
add_all_bridges(bridged_model, ::Type{T})
@@ -82,8 +99,8 @@ Add all bridges defined in the `Bridges.Constraint` submodule to
8299
"""
83100
function add_all_bridges(bridged_model, ::Type{T}) where {T}
84101
if T <: AbstractFloat
85-
MOIB.add_bridge(bridged_model, GreaterToIntervalBridge{T})
86-
MOIB.add_bridge(bridged_model, LessToIntervalBridge{T})
102+
MOIB.add_bridge(bridged_model, GreaterToIntervalBridge{T})
103+
MOIB.add_bridge(bridged_model, LessToIntervalBridge{T})
87104
end
88105

89106
MOIB.add_bridge(bridged_model, GreaterToLessBridge{T})

‎src/Bridges/Constraint/bridge.jl‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,13 @@ MOI.get(::AbstractBridge, ::MOI.ListOfVariableIndices) = MOI.VariableIndex[]
4747
4848
Return a `Bool` indicating whether the bridges of type `BT` support bridging `F`-in-`S` constraints.
4949
"""
50-
MOI.supports_constraint(::Type{<:AbstractBridge}, ::Type{<:MOI.AbstractFunction}, ::Type{<:MOI.AbstractSet}) = false
50+
function MOI.supports_constraint(
51+
::Type{<:AbstractBridge},
52+
::Type{<:MOI.AbstractFunction},
53+
::Type{<:MOI.AbstractSet},
54+
)
55+
return false
56+
end
5157

5258
"""
5359
added_constrained_variable_types(BT::Type{<:MOI.Bridges.Constraint.AbstractBridge},
@@ -59,10 +65,12 @@ add for bridging `F`-in-`S` constraints. This falls back to
5965
`added_constrained_variable_types(concrete_bridge_type(BT, F, S))`
6066
so bridges should not implement this method.
6167
"""
62-
function MOIB.added_constrained_variable_types(BT::Type{<:AbstractBridge},
63-
F::Type{<:MOI.AbstractFunction},
64-
S::Type{<:MOI.AbstractSet})
65-
MOIB.added_constrained_variable_types(concrete_bridge_type(BT, F, S))
68+
function MOIB.added_constrained_variable_types(
69+
BT::Type{<:AbstractBridge},
70+
F::Type{<:MOI.AbstractFunction},
71+
S::Type{<:MOI.AbstractSet},
72+
)
73+
return MOIB.added_constrained_variable_types(concrete_bridge_type(BT, F, S))
6674
end
6775

6876
"""
@@ -75,10 +83,12 @@ bridging `F`-in-`S` constraints. This falls back to
7583
`added_constraint_types(concrete_bridge_type(BT, F, S))`
7684
so bridges should not implement this method.
7785
"""
78-
function MOIB.added_constraint_types(BT::Type{<:AbstractBridge},
79-
F::Type{<:MOI.AbstractFunction},
80-
S::Type{<:MOI.AbstractSet})
81-
MOIB.added_constraint_types(concrete_bridge_type(BT, F, S))
86+
function MOIB.added_constraint_types(
87+
BT::Type{<:AbstractBridge},
88+
F::Type{<:MOI.AbstractFunction},
89+
S::Type{<:MOI.AbstractSet},
90+
)
91+
return MOIB.added_constraint_types(concrete_bridge_type(BT, F, S))
8292
end
8393

8494
"""
@@ -108,14 +118,18 @@ MOI.Bridges.Constraint.concrete_bridge_type(BT, F, S)
108118
MOI.Bridges.Constraint.SplitIntervalBridge{Float64,MOI.SingleVariable}
109119
```
110120
"""
111-
function concrete_bridge_type(bridge_type::DataType,
112-
::Type{<:MOI.AbstractFunction},
113-
::Type{<:MOI.AbstractSet})
121+
function concrete_bridge_type(
122+
bridge_type::DataType,
123+
::Type{<:MOI.AbstractFunction},
124+
::Type{<:MOI.AbstractSet},
125+
)
114126
return bridge_type
115127
end
116128

117-
function concrete_bridge_type(b::MOIB.AbstractBridgeOptimizer,
118-
F::Type{<:MOI.AbstractFunction},
119-
S::Type{<:MOI.AbstractSet})
129+
function concrete_bridge_type(
130+
b::MOIB.AbstractBridgeOptimizer,
131+
F::Type{<:MOI.AbstractFunction},
132+
S::Type{<:MOI.AbstractSet},
133+
)
120134
return concrete_bridge_type(MOIB.bridge_type(b, F, S), F, S)
121135
end

0 commit comments

Comments
 (0)