Skip to content

Commit ecbfe8f

Browse files
committed
Fix LazyBridgeOptimizer tests
1 parent 5640b20 commit ecbfe8f

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

test/bridge.jl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,16 @@ end
6868
end
6969
end
7070

71+
# Model not supporting RotatedSecondOrderCone
72+
MOIU.@model NoRSOCModel () (EqualTo, GreaterThan, LessThan, Interval) (Zeros, Nonnegatives, Nonpositives, SecondOrderCone, PositiveSemidefiniteConeTriangle) () (SingleVariable,) (ScalarAffineFunction,) (VectorOfVariables,) (VectorAffineFunction,)
73+
7174
@testset "LazyBridgeOptimizer" begin
72-
const mock = MOIU.MockOptimizer(SimpleModel{Float64}())
75+
const mock = MOIU.MockOptimizer(NoRSOCModel{Float64}())
7376
const bridgedmock = MOIB.LazyBridgeOptimizer(mock, Model{Float64}())
7477
MOIB.addbridge!(bridgedmock, MOIB.SplitIntervalBridge{Float64})
75-
MOIB.addbridge!(bridgedmock, MOIB.RSOCtoPSDBridge{Float64})
76-
MOIB.addbridge!(bridgedmock, MOIB.SOCtoPSDBridge{Float64})
77-
MOIB.addbridge!(bridgedmock, MOIB.RSOCtoPSDBridge{Float64})
78+
MOIB.addbridge!(bridgedmock, MOIB.RSOCtoPSDCBridge{Float64})
79+
MOIB.addbridge!(bridgedmock, MOIB.SOCtoPSDCBridge{Float64})
80+
MOIB.addbridge!(bridgedmock, MOIB.RSOCBridge{Float64})
7881

7982
@testset "Name test" begin
8083
MOIT.nametest(bridgedmock)
@@ -85,15 +88,15 @@ end
8588
MOIT.failcopytestia(bridgedmock)
8689
MOIT.failcopytestva(bridgedmock)
8790
MOIT.failcopytestca(bridgedmock)
88-
MOIT.copytest(bridgedmock, SimpleModel{Float64}())
91+
MOIT.copytest(bridgedmock, NoRSOCModel{Float64}())
8992
end
9093

9194
# Test that RSOCtoPSD is used instead of RSOC+SOCtoPSD as it is a shortest path
9295
@testset "Bridge selection" begin
9396
MOI.empty!(bridgedmock)
9497
x = MOI.addvariables!(bridgedmock, 3)
9598
c = MOI.addconstraint!(bridgedmock, MOI.VectorOfVariables(x), MOI.RotatedSecondOrderCone(3))
96-
@test MOIB.bridge(bridgedmock, c) isa RSOCtoPSDBridge
99+
@test MOIB.bridge(bridgedmock, c) isa MOIB.RSOCtoPSDCBridge
97100
end
98101

99102
@testset "Continuous Linear" begin

0 commit comments

Comments
 (0)