Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/algorithms/Chalmet.jl
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function minimize_multiobjective!(algorithm::Chalmet, model::Optimizer)
optimize_inner!(model)
status = MOI.get(model.inner, MOI.TerminationStatus())
if !_is_scalar_status_optimal(status)
return status, nothing
return status, solutions
end
_, y1[2] = _compute_point(model, variables, f2)
MOI.set(model.inner, MOI.ObjectiveFunction{typeof(f1)}(), f1)
Expand All @@ -69,7 +69,7 @@ function minimize_multiobjective!(algorithm::Chalmet, model::Optimizer)
optimize_inner!(model)
status = MOI.get(model.inner, MOI.TerminationStatus())
if !_is_scalar_status_optimal(status)
return status, nothing
return status, solutions
end
x1, y1[1] = _compute_point(model, variables, f1)
MOI.delete(model.inner, y1_constraint)
Expand All @@ -78,7 +78,7 @@ function minimize_multiobjective!(algorithm::Chalmet, model::Optimizer)
optimize_inner!(model)
status = MOI.get(model.inner, MOI.TerminationStatus())
if !_is_scalar_status_optimal(status)
return status, nothing
return status, solutions
end
_, y2[1] = _compute_point(model, variables, f1)
if y2[1] ≈ solutions[1].y[1]
Expand All @@ -93,7 +93,7 @@ function minimize_multiobjective!(algorithm::Chalmet, model::Optimizer)
optimize_inner!(model)
status = MOI.get(model.inner, MOI.TerminationStatus())
if !_is_scalar_status_optimal(status)
return status, nothing
return status, solutions
end
x2, y2[2] = _compute_point(model, variables, f2)
MOI.delete(model.inner, y2_constraint)
Expand Down
1 change: 1 addition & 0 deletions test/algorithms/Chalmet.jl
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ function test_solve_failures()
end
MOI.optimize!(model)
@test MOI.get(model, MOI.TerminationStatus()) == MOI.NUMERICAL_ERROR
@test MOI.get(model, MOI.ResultCount()) == (fail_after <= 1 ? 0 : 1)
end
return
end
Expand Down
Loading