Skip to content

Commit ae6fdcf

Browse files
IssamTIssamT
committed
fixing style
1 parent bcb5502 commit ae6fdcf

File tree

6 files changed

+66
-17
lines changed

6 files changed

+66
-17
lines changed

‎src/Bridges/Bridges.jl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,16 @@ include("singlebridgeoptimizer.jl")
2424
include("lazybridgeoptimizer.jl")
2525

2626
# This is used by JuMP and removes the need to update JuMP everytime a bridge is added
27-
MOIU.@model AllBridgedConstraints () (MOI.Interval,) (MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone, MOI.LogDetConeTriangle, MOI.RootDetConeTriangle) () () (MOI.ScalarAffineFunction,) (MOI.VectorOfVariables,) (MOI.VectorAffineFunction,)
27+
MOIU.@model(AllBridgedConstraints,
28+
(),
29+
(MOI.Interval,),
30+
(MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone,
31+
MOI.LogDetConeTriangle, MOI.RootDetConeTriangle),
32+
(),
33+
(),
34+
(MOI.ScalarAffineFunction,),
35+
(MOI.VectorOfVariables,),
36+
(MOI.VectorAffineFunction,))
2837
"""
2938
fullbridgeoptimizer(model::MOI.ModelLike, ::Type{T}) where T
3039

‎src/Bridges/singlebridgeoptimizer.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ is_bridged(b::SingleBridgeOptimizer, ::Type{<:MOI.AbstractFunction}, ::Type{<:MO
1717
bridge_type(b::SingleBridgeOptimizer{BT}, F::Type{<:MOI.AbstractFunction}, S::Type{<:MOI.AbstractSet}) where BT = BT
1818

1919
# :((Zeros, SecondOrderCone)) -> (:(MOI.Zeros), :(MOI.SecondOrderCone))
20-
_tuple_prefix_moi(t) = t.args
2120

2221
"""
2322
macro bridge(modelname, bridge, scalarsets, typedscalarsets, vectorsets, typedvectorsets, scalarfunctions, typedscalarfunctions, vectorfunctions, typedvectorfunctions)

‎src/Utilities/model.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,12 @@ abstract type Constraints{F} end
393393

394394
abstract type SymbolFS end
395395
struct SymbolFun <: SymbolFS
396-
s::Union{Symbol,Expr}
396+
s::Union{Symbol, Expr}
397397
typed::Bool
398398
cname::Symbol
399399
end
400400
struct SymbolSet <: SymbolFS
401-
s::Union{Symbol,Expr}
401+
s::Union{Symbol, Expr}
402402
typed::Bool
403403
end
404404

@@ -623,5 +623,5 @@ macro model(modelname, ss, sst, vs, vst, sf, sft, vf, vft)
623623

624624
$code
625625
end
626-
esc(code)
626+
return esc(code)
627627
end

‎test/bridge.jl

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Model not supporting Interval
2-
MOIU.@model SimpleModel () (MOI.EqualTo, MOI.GreaterThan, MOI.LessThan) (MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone, MOI.PositiveSemidefiniteConeTriangle, MOI.ExponentialCone) () (MOI.SingleVariable,) (MOI.ScalarAffineFunction, MOI.ScalarQuadraticFunction) (MOI.VectorOfVariables,) (MOI.VectorAffineFunction,)
2+
MOIU.@model(SimpleModel,
3+
(),
4+
(MOI.EqualTo, MOI.GreaterThan, MOI.LessThan),
5+
(MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone,
6+
MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone,
7+
MOI.PositiveSemidefiniteConeTriangle, MOI.ExponentialCone),
8+
(),
9+
(MOI.SingleVariable,),
10+
(MOI.ScalarAffineFunction, MOI.ScalarQuadraticFunction),
11+
(MOI.VectorOfVariables,),
12+
(MOI.VectorAffineFunction,))
313

414
function test_noc(bridgedmock, F, S, n)
515
@test MOI.get(bridgedmock, MOI.NumberOfConstraints{F, S}()) == n
@@ -109,7 +119,16 @@ end
109119
end
110120

111121
# Model not supporting RotatedSecondOrderCone
112-
MOIU.@model NoRSOCModel () (MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval) (MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone, MOI.ExponentialCone, MOI.PositiveSemidefiniteConeTriangle) () (MOI.SingleVariable,) (MOI.ScalarAffineFunction,) (MOI.VectorOfVariables,) (MOI.VectorAffineFunction,)
122+
MOIU.@model(NoRSOCModel,
123+
(),
124+
(MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval),
125+
(MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone,
126+
MOI.ExponentialCone, MOI.PositiveSemidefiniteConeTriangle),
127+
(),
128+
(MOI.SingleVariable,),
129+
(MOI.ScalarAffineFunction,),
130+
(MOI.VectorOfVariables,),
131+
(MOI.VectorAffineFunction,))
113132

114133
@testset "LazyBridgeOptimizer" begin
115134
mock = MOIU.MockOptimizer(NoRSOCModel{Float64}())

‎test/model.jl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
MOIU.@model LPModel () (MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval) (MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives) () (MOI.SingleVariable,) (MOI.ScalarAffineFunction,) (MOI.VectorOfVariables,) (MOI.VectorAffineFunction,)
1+
MOIU.@model(LPModel,
2+
(),
3+
(MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval),
4+
(MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives),
5+
(),
6+
(MOI.SingleVariable,),
7+
(MOI.ScalarAffineFunction,),
8+
(MOI.VectorOfVariables,),
9+
(MOI.VectorAffineFunction,))
210

311
@testset "Name test" begin
412
MOIT.nametest(Model{Float64}())

‎test/runtests.jl

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,30 @@ end
2020
# Needed by test spread over several files, defining it here make it easier to comment out tests
2121
# Model supporting every MOI functions and sets
2222
MOIU.@model(Model,
23-
(MOI.ZeroOne, MOI.Integer),
24-
(MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval, MOI.Semicontinuous, MOI.Semiinteger),
25-
(MOI.Reals, MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone, MOI.ExponentialCone, MOI.DualExponentialCone, MOI.PositiveSemidefiniteConeTriangle, MOI.PositiveSemidefiniteConeSquare, MOI.RootDetConeTriangle, MOI.RootDetConeSquare, MOI.LogDetConeTriangle, MOI.LogDetConeSquare),
26-
(MOI.PowerCone, MOI.DualPowerCone, MOI.SOS1, MOI.SOS2),
27-
(MOI.SingleVariable,),
28-
(MOI.ScalarAffineFunction, MOI.ScalarQuadraticFunction),
29-
(MOI.VectorOfVariables,),
30-
(MOI.VectorAffineFunction, MOI.VectorQuadraticFunction))
23+
(MOI.ZeroOne, MOI.Integer),
24+
(MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval,
25+
MOI.Semicontinuous, MOI.Semiinteger),
26+
(MOI.Reals, MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives,
27+
MOI.SecondOrderCone, MOI.RotatedSecondOrderCone,
28+
MOI.GeometricMeanCone, MOI.ExponentialCone, MOI.DualExponentialCone,
29+
MOI.PositiveSemidefiniteConeTriangle, MOI.PositiveSemidefiniteConeSquare,
30+
MOI.RootDetConeTriangle, MOI.RootDetConeSquare, MOI.LogDetConeTriangle,
31+
MOI.LogDetConeSquare),
32+
(MOI.PowerCone, MOI.DualPowerCone, MOI.SOS1, MOI.SOS2),
33+
(MOI.SingleVariable,),
34+
(MOI.ScalarAffineFunction, MOI.ScalarQuadraticFunction),
35+
(MOI.VectorOfVariables,),
36+
(MOI.VectorAffineFunction, MOI.VectorQuadraticFunction))
37+
3138
# Model supporting only SecondOrderCone as non-LP cone.
32-
@MOIU.model ModelForMock (MOI.ZeroOne, MOI.Integer) (MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval) (MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone) () (MOI.SingleVariable,) (MOI.ScalarAffineFunction, MOI.ScalarQuadraticFunction) (MOI.VectorOfVariables,) (MOI.VectorAffineFunction,)
39+
MOIU.@model(ModelForMock, (MOI.ZeroOne, MOI.Integer),
40+
(MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval),
41+
(MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone),
42+
(),
43+
(MOI.SingleVariable,),
44+
(MOI.ScalarAffineFunction, MOI.ScalarQuadraticFunction),
45+
(MOI.VectorOfVariables,),
46+
(MOI.VectorAffineFunction,))
3347

3448
# Utilities submodule tests
3549
@testset "MOI.Utilities" begin

0 commit comments

Comments
 (0)