Skip to content

Commit 43b1b5a

Browse files
committed
and add mipsolver
1 parent b31c2c9 commit 43b1b5a

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

check/TestLpValidation.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,8 @@ TEST_CASE("LP-extreme-coefficient", "[highs_data]") {
449449
if (dev_run) printf("highs.run(); returns %d\n", (int)return_status);
450450
REQUIRE(return_status == HighsStatus::kOk);
451451
REQUIRE(highs.getModelStatus() == HighsModelStatus::kInfeasible);
452+
453+
highs.resetGlobalScheduler(true);
452454
}
453455

454456
TEST_CASE("LP-inf-cost", "[highs_data]") {
@@ -573,6 +575,8 @@ TEST_CASE("LP-inf-cost", "[highs_data]") {
573575
REQUIRE(highs.getInfo().objective_function_value == -my_infinite_cost);
574576
// Check that x was fixed at 1, not 0.5
575577
REQUIRE(highs.getSolution().col_value[0] == 1);
578+
579+
highs.resetGlobalScheduler(true);
576580
}
577581

578582
TEST_CASE("LP-change-coefficient", "[highs_data]") {
@@ -618,6 +622,8 @@ TEST_CASE("LP-change-coefficient", "[highs_data]") {
618622
delta_objective_value = std::fabs(required_objective_value -
619623
highs.getInfo().objective_function_value);
620624
REQUIRE(delta_objective_value < 1e-8);
625+
626+
highs.resetGlobalScheduler(true);
621627
}
622628

623629
TEST_CASE("LP-illegal-empty-start-ok", "[highs_data]") {
@@ -631,6 +637,8 @@ TEST_CASE("LP-illegal-empty-start-ok", "[highs_data]") {
631637
lp.a_matrix_.start_ = {1};
632638
REQUIRE(highs.passModel(lp) == HighsStatus::kOk);
633639
REQUIRE(highs.getLp().a_matrix_.start_[0] == 0);
640+
641+
highs.resetGlobalScheduler(true);
634642
}
635643

636644
TEST_CASE("LP-row-wise", "[highs_data]") {
@@ -651,6 +659,8 @@ TEST_CASE("LP-row-wise", "[highs_data]") {
651659
lp.row_upper_ = {80, 120};
652660
highs.passModel(lp);
653661
highs.run();
662+
663+
highs.resetGlobalScheduler(true);
654664
}
655665

656666
TEST_CASE("LP-infeasible-bounds", "[highs_data]") {
@@ -678,4 +688,6 @@ TEST_CASE("LP-infeasible-bounds", "[highs_data]") {
678688
highs.changeColBounds(0, 0, -1);
679689
highs.run();
680690
REQUIRE(highs.getModelStatus() == HighsModelStatus::kInfeasible);
691+
692+
highs.resetGlobalScheduler(true);
681693
}

check/TestMipSolver.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ TEST_CASE("MIP-distillation", "[highs_test_mip_solver]") {
2121
Highs highs;
2222
if (!dev_run) highs.setOptionValue("output_flag", false);
2323
distillationMIP(highs);
24+
25+
highs.resetGlobalScheduler(true);
2426
}
2527

2628
TEST_CASE("MIP-rowless", "[highs_test_mip_solver]") {

0 commit comments

Comments
 (0)