Skip to content

Commit 4e2b836

Browse files
authored
Allow stage PRESOLVING in assert_solved
This might happen if a user limit (ie time) stops the solver during presolving.
1 parent 697be6b commit 4e2b836

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/MOI_wrapper/results.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ end
5151
function assert_stage(o::Optimizer, stages)
5252
stage = SCIPgetStage(o)
5353
if !(stage in stages)
54-
error("SCIP is wrong stage ($stage, need $stages), can not query results!")
54+
error("SCIP is wrong stage ($stage, need $stages)!")
5555
end
5656
end
5757

5858
"Make sure that the problem was solved (SCIP is in SOLVED stage)."
5959
function assert_solved(o::Optimizer)
6060
# SCIP's stage is SOLVING when stopped by user limit!
61-
assert_stage(o, (SCIP_STAGE_SOLVING, SCIP_STAGE_SOLVED))
61+
assert_stage(o, (SCIP_STAGE_PRESOLVING, SCIP_STAGE_SOLVING, SCIP_STAGE_SOLVED))
6262

6363
# Check for invalid status (when stage is SOLVING).
6464
status = SCIPgetStatus(o)

0 commit comments

Comments
 (0)