Skip to content

Commit 9668f8d

Browse files
committed
fixed error from contconic test
1 parent aa487c0 commit 9668f8d

1 file changed

Lines changed: 16 additions & 12 deletions

File tree

test/Test/contconic.jl

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,12 @@ end
217217
MOIT.psds3test(mock, config)
218218
end
219219
@testset "LogDet" begin
220-
# TODO fix: errors with "Fallback getter for variable constraint dual does not support other variable-wise constraints on the variable"
221-
# mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [0, 1, 0, 1, 1],
222-
# (MOI.SingleVariable, MOI.EqualTo{Float64}) => [2],
223-
# (MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1, 1]])
224-
# MOIT.logdett1vtest(mock, config)
220+
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [0, 1, 0, 1, 1],
221+
(MOI.SingleVariable, MOI.EqualTo{Float64}) => [2],
222+
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1, 1]],
223+
(MOI.VectorOfVariables, MOI.LogDetConeTriangle) => [[-1, -2, 1, 0, 1]])
224+
mock.eval_variable_constraint_dual = false
225+
MOIT.logdett1vtest(mock, config)
225226
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [0, 1, 0, 1, 1],
226227
(MOI.SingleVariable, MOI.EqualTo{Float64}) => [2],
227228
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1, 1]],
@@ -230,11 +231,12 @@ end
230231
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [log(5)],
231232
(MOI.VectorAffineFunction{Float64}, MOI.LogDetConeTriangle) => [[-1, log(5) - 3, 1, -1, 1.6, 0, -0.2, 0.4]])
232233
MOIT.logdett2test(mock, config)
233-
# TODO fix: errors with "Fallback getter for variable constraint dual does not support other variable-wise constraints on the variable"
234-
# mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [0, 1, 0, 0, 1, 1],
235-
# (MOI.SingleVariable, MOI.EqualTo{Float64}) => [2],
236-
# (MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1, 1]])
237-
# MOIT.logdets1vtest(mock, config)
234+
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [0, 1, 0, 0, 1, 1],
235+
(MOI.SingleVariable, MOI.EqualTo{Float64}) => [2],
236+
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1, 1]],
237+
(MOI.VectorOfVariables, MOI.LogDetConeSquare) => [[-1, -2, 1, 0, 0, 1]])
238+
mock.eval_variable_constraint_dual = false
239+
MOIT.logdets1vtest(mock, config)
238240
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [0, 1, 0, 0, 1, 1],
239241
(MOI.SingleVariable, MOI.EqualTo{Float64}) => [2],
240242
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1, 1]],
@@ -246,7 +248,8 @@ end
246248
end
247249
@testset "RootDet" begin
248250
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [1, 1, 0, 1],
249-
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[0.5, 0.5]])
251+
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[0.5, 0.5]],
252+
(MOI.VectorOfVariables, MOI.RootDetConeTriangle) => [[-1.0, 0.5, 0.0, 0.5]])
250253
MOIT.rootdett1vtest(mock, config)
251254
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [1, 1, 0, 1],
252255
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[0.5, 0.5]],
@@ -256,7 +259,8 @@ end
256259
(MOI.VectorAffineFunction{Float64}, MOI.RootDetConeTriangle) => [vcat(-1, [1, -1, 1.6, 0, -0.2, 0.4] / 3 * (5 ^ inv(3)))])
257260
MOIT.rootdett2test(mock, config)
258261
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [1, 1, 0, 0, 1],
259-
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[0.5, 0.5]])
262+
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[0.5, 0.5]],
263+
(MOI.VectorOfVariables, MOI.RootDetConeSquare) => [[-1.0, 0.5, 0.0, 0.0, 0.5]])
260264
MOIT.rootdets1vtest(mock, config)
261265
mock.optimize! = (mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock, [1, 1, 0, 0, 1],
262266
(MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[0.5, 0.5]],

0 commit comments

Comments
 (0)