Skip to content

Commit 81d7052

Browse files
committed
fix order of scheduler reset and return in TestPresolve:
1 parent 8e7dac2 commit 81d7052

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

check/TestPresolve.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,10 @@ HighsStatus zeroCostColSing() {
258258
assert(status == HighsStatus::kOk);
259259

260260
status = highs.run();
261-
return status;
262261

263262
highs.resetGlobalScheduler(true);
263+
264+
return status;
264265
}
265266

266267
// handled by doubleton equality
@@ -317,9 +318,9 @@ HighsStatus colSingDoubletonEquality() {
317318
assert(status == HighsStatus::kOk);
318319

319320
status = highs.run();
320-
return status;
321321

322322
highs.resetGlobalScheduler(true);
323+
return status;
323324
}
324325

325326
HighsStatus colSingDoubletonInequality() {
@@ -375,9 +376,9 @@ HighsStatus colSingDoubletonInequality() {
375376
assert(status == HighsStatus::kOk);
376377

377378
status = highs.run();
378-
return status;
379379

380380
highs.resetGlobalScheduler(true);
381+
return status;
381382
}
382383

383384
// handled by doubleton equality
@@ -414,9 +415,9 @@ HighsStatus twoColSingDoubletonEquality() {
414415
assert(status == HighsStatus::kOk);
415416

416417
status = highs.run();
417-
return status;
418418

419419
highs.resetGlobalScheduler(true);
420+
return status;
420421
}
421422

422423
// handled by special case.
@@ -454,9 +455,9 @@ HighsStatus twoColSingDoubletonInequality() {
454455

455456
highs.run();
456457
status = highs.run();
457-
return status;
458458

459459
highs.resetGlobalScheduler(true);
460+
return status;
460461
}
461462

462463
// No commas in test case name.
@@ -543,9 +544,9 @@ HighsStatus issue425() {
543544
assert(status == HighsStatus::kOk);
544545

545546
status = highs.run();
546-
return status;
547547

548548
highs.resetGlobalScheduler(true);
549+
return status;
549550
}
550551

551552
TEST_CASE("presolve-issue-425", "[highs_test_presolve]") {

0 commit comments

Comments
 (0)