Skip to content

Commit 7424e2f

Browse files
blegatblegat
authored
Merge pull request #23 from JuliaOpt/bl/moi8
Update to MOI v0.8
2 parents 9ecd36d + 6dc745a commit 7424e2f

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎REQUIRE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
julia 0.6
2-
MathOptInterface 0.7 0.8
2+
MathOptInterface 0.8 0.9
33
Compat 1.0.1

‎src/load.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include("constraint.jl")
33

44
function MOIU.allocate(optimizer::SOItoMOIBridge, ::MOI.ObjectiveSense, sense::MOI.OptimizationSense)
55
# To be sure that it is done before load(optimizer, ::ObjectiveFunction, ...), we do it in allocate
6-
optimizer.objsign = sense == MOI.MinSense ? -1 : 1
6+
optimizer.objsign = sense == MOI.MIN_SENSE ? -1 : 1
77
end
88
function MOIU.allocate(::SOItoMOIBridge, ::MOI.ObjectiveFunction, ::Union{MOI.SingleVariable, MOI.ScalarAffineFunction}) end
99

‎src/mock.jl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ MockSDOptimizer{T}() where T = MockSDOptimizer{T}(0,
5353
(::MockSDOptimizer) -> begin end,
5454
false,
5555
false,
56-
MOI.OptimizeNotCalled,
57-
MOI.NoSolution,
58-
MOI.NoSolution,
56+
MOI.OPTIMIZE_NOT_CALLED,
57+
MOI.NO_SOLUTION,
58+
MOI.NO_SOLUTION,
5959
BlockMatrix{T}(Matrix{T}[]),
6060
BlockMatrix{T}(Matrix{T}[]),
6161
T[])
@@ -71,9 +71,9 @@ function MOI.empty!(mock::MockSDOptimizer{T}) where T
7171
mock.constraint_coefficients = Vector{Tuple{T, Int, Int, Int}}[]
7272
mock.hasprimal = false
7373
mock.hasdual = false
74-
mock.terminationstatus = MOI.OptimizeNotCalled
75-
mock.primalstatus = MOI.NoSolution
76-
mock.dualstatus = MOI.NoSolution
74+
mock.terminationstatus = MOI.OPTIMIZE_NOT_CALLED
75+
mock.primalstatus = MOI.NO_SOLUTION
76+
mock.dualstatus = MOI.NO_SOLUTION
7777
mock.X = BlockMatrix{T}(Matrix{T}[])
7878
mock.Z = BlockMatrix{T}(Matrix{T}[])
7979
mock.y = T[]
@@ -167,7 +167,7 @@ function MOIU.mock_optimize!(mock::MockSDOptimizer, termstatus::MOI.TerminationS
167167
end
168168
# Default termination status
169169
function MOIU.mock_optimize!(mock::MockSDOptimizer, primdual...)
170-
MOIU.mock_optimize!(mock, MOI.Optimal, primdual...)
170+
MOIU.mock_optimize!(mock, MOI.OPTIMAL, primdual...)
171171
end
172172
function MOIU.mock_optimize!(mock::MockSDOptimizer, termstatus::MOI.TerminationStatusCode)
173173
MOI.set(mock, MOI.TerminationStatus(), termstatus)
@@ -179,7 +179,7 @@ function MOIU.mock_primal!(mock::MockSDOptimizer, primstatus::MOI.ResultStatusCo
179179
MOIU.mock_varprimal!(mock, varprim...)
180180
end
181181
# Default primal status
182-
MOIU.mock_primal!(mock::MockSDOptimizer, varprim::Vector) = MOIU.mock_primal!(mock, MOI.FeasiblePoint, varprim)
182+
MOIU.mock_primal!(mock::MockSDOptimizer, varprim::Vector) = MOIU.mock_primal!(mock, MOI.FEASIBLE_POINT, varprim)
183183
function MOIU.mock_primal!(mock::MockSDOptimizer)
184184
# No primal solution
185185
mock.hasprimal = false
@@ -206,7 +206,7 @@ function MOIU.mock_dual!(mock::MockSDOptimizer, dualstatus::MOI.ResultStatusCode
206206
end
207207
# Default dual status
208208
function MOIU.mock_dual!(mock::MockSDOptimizer, conduals...)
209-
status = !mock.hasprimal || MOI.get(mock, MOI.PrimalStatus()) == MOI.InfeasiblePoint ? MOI.InfeasibilityCertificate : MOI.FeasiblePoint
209+
status = !mock.hasprimal || MOI.get(mock, MOI.PrimalStatus()) == MOI.INFEASIBLE_POINT ? MOI.INFEASIBILITY_CERTIFICATE : MOI.FEASIBLE_POINT
210210
MOIU.mock_dual!(mock, status, conduals...)
211211
end
212212
function MOIU.mock_dual!(mock::MockSDOptimizer)
@@ -223,7 +223,7 @@ function MOIU.mock_condual!(mock::MockSDOptimizer{T}, y::Vector{T}) where T
223223
mock.Z = BlockMatrix{T}(map(n -> zeros(T, abs(n), abs(n)), mock.blkdims))
224224
# FIXME shouldn't Z be defined as the opposite i.e. Z = C - sum y_i A_i >= 0
225225
# instead of sum y_i A_i - C <= 0 ?
226-
if mock.dualstatus != MOI.InfeasibilityCertificate
226+
if mock.dualstatus != MOI.INFEASIBILITY_CERTIFICATE
227227
# Infeasibility certificate is a ray so we only take the homogeneous part
228228
# FIXME:check that this is also done IN MOIU.MockOptimizer
229229
for (α, blk, i, j) in mock.objective_coefficients

‎test/contconic.jl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
[70.2006, -7.0, -2.0, 4.0]))
1818
MOIT.lin2vtest(cached_mock_optimizer, config)
1919
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
20-
MOI.Infeasible,
21-
MOI.InfeasiblePoint,
20+
MOI.INFEASIBLE,
21+
MOI.INFEASIBLE_POINT,
2222
[-0.5, 0.5]))
2323
MOIT.lin3test(cached_mock_optimizer, config)
2424
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
25-
MOI.Infeasible,
26-
MOI.InfeasiblePoint,
25+
MOI.INFEASIBLE,
26+
MOI.INFEASIBLE_POINT,
2727
[-1.0]))
2828
MOIT.lin4test(cached_mock_optimizer, config)
2929
end
@@ -45,8 +45,8 @@
4545
[-1.4142, 1.0, -0.7071, -1.0, -0.3536, 1.0, 0.7071, -0.3536]))
4646
MOIT.soc2ptest(MOIB.SOCtoPSD{Float64}(cached_mock_optimizer), config)
4747
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
48-
MOI.Infeasible,
49-
MOI.InfeasiblePoint,
48+
MOI.INFEASIBLE,
49+
MOI.INFEASIBLE_POINT,
5050
[-1.0, 1.0, -0.5, 1.0, -0.5]))
5151
MOIT.soc3test(MOIB.SOCtoPSD{Float64}(cached_mock_optimizer), config)
5252
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
@@ -64,7 +64,7 @@
6464
[5183.15, 5182.44, -1.4142, 1.0, -0.1768, 1.0, -0.3536, -0.1768]))
6565
MOIT.rotatedsoc1vtest(MOIB.RSOCtoPSD{Float64}(cached_mock_optimizer), config)
6666
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
67-
MOI.Infeasible,
67+
MOI.INFEASIBLE,
6868
tuple(),
6969
[141.088, -47.8864, 47.5533, -46.2201]))
7070
MOIT.rotatedsoc2test(MOIB.RSOCtoPSD{Float64}(cached_mock_optimizer), config)

‎test/contlinear.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,17 @@
8080
MOIT.linear7test(cached_mock_optimizer, config)
8181

8282
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
83-
MOI.Infeasible,
83+
MOI.INFEASIBLE,
8484
tuple(),
8585
[1.0]))
8686
MOIT.linear8atest(cached_mock_optimizer, config)
8787
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
88-
MOI.DualInfeasible,
89-
(MOI.InfeasibilityCertificate, [[0.7709], [0.2291], [0.3126]])))
88+
MOI.DUAL_INFEASIBLE,
89+
(MOI.INFEASIBILITY_CERTIFICATE, [[0.7709], [0.2291], [0.3126]])))
9090
MOIT.linear8btest(cached_mock_optimizer, config)
9191
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
92-
MOI.DualInfeasible,
93-
(MOI.InfeasibilityCertificate, [[0.5], [0.5]])))
92+
MOI.DUAL_INFEASIBLE,
93+
(MOI.INFEASIBILITY_CERTIFICATE, [[0.5], [0.5]])))
9494
MOIT.linear8ctest(cached_mock_optimizer, config)
9595
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
9696
[[29.0909], [36.3636], [4.5455], [0.0], [0.0001]],
@@ -117,7 +117,7 @@
117117
[-1.0, 0.0]))
118118
MOIT.linear11test(cached_mock_optimizer, config)
119119
MOIU.set_mock_optimize!(mock, (mock) -> MOIU.mock_optimize!(mock,
120-
MOI.Infeasible,
120+
MOI.INFEASIBLE,
121121
tuple(),
122122
[1.0, 3.0]))
123123
MOIT.linear12test(cached_mock_optimizer, config)

0 commit comments

Comments
 (0)