Skip to content

Commit e749d21

Browse files
committed
Update
1 parent de77e84 commit e749d21

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/algorithms/TambyVanderpooten.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,9 @@ function minimize_multiobjective!(
158158
end
159159
end
160160
optimize_inner!(model)
161-
if !_is_scalar_status_optimal(model)
161+
status = MOI.get(model.inner, MOI.TerminationStatus())
162+
if !_is_scalar_status_optimal(status)
162163
MOI.delete.(model, ε_constraints)
163-
# If this fails, it likely means that the solver experienced a
164-
# numerical error with this box. Just skip it.
165164
return status, nothing
166165
end
167166
y_k = MOI.get(model.inner, MOI.ObjectiveValue())
@@ -173,9 +172,8 @@ function minimize_multiobjective!(
173172
MOI.EqualTo(y_k),
174173
)
175174
optimize_inner!(model)
176-
if !_is_scalar_status_optimal(model)
177-
# If this fails, it likely means that the solver experienced a
178-
# numerical error with this box. Just skip it.
175+
status = MOI.get(model.inner, MOI.TerminationStatus())
176+
if !_is_scalar_status_optimal(status)
179177
MOI.delete.(model, ε_constraints)
180178
MOI.delete(model, y_k_constraint)
181179
return status, nothing

test/algorithms/TambyVanderpooten.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ function test_solve_failures()
170170
MOI.add_constraint(model, sum(1.0 .* x[:, j]), MOI.EqualTo(1.0))
171171
end
172172
MOI.optimize!(model)
173-
@test MOI.get(model, MOI.TerminationStatus()) ==
174-
(fail_after <= 3 ? MOI.NUMERICAL_ERROR : MOI.OPTIMAL)
173+
@test MOI.get(model, MOI.TerminationStatus()) == MOI.NUMERICAL_ERROR
175174
@test MOI.get(model, MOI.ResultCount()) == 0
176175
end
177176
return

0 commit comments

Comments
 (0)