Skip to content

Commit a13702f

Browse files
committed
Formatted
1 parent 3bd0aff commit a13702f

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

check/TestMipSolver.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,9 +1013,11 @@ TEST_CASE("mip-lp-solver-string", "[highs_test_mip_solver]") {
10131013
REQUIRE(h.setOptionValue(kMipLpSolverString, kIpmString) == HighsStatus::kOk);
10141014

10151015
#ifdef HIPO
1016-
REQUIRE(h.setOptionValue(kMipLpSolverString, kHipoString) == HighsStatus::kOk);
1016+
REQUIRE(h.setOptionValue(kMipLpSolverString, kHipoString) ==
1017+
HighsStatus::kOk);
10171018
#else
1018-
REQUIRE(h.setOptionValue(kMipLpSolverString, kHipoString) == HighsStatus::kError);
1019+
REQUIRE(h.setOptionValue(kMipLpSolverString, kHipoString) ==
1020+
HighsStatus::kError);
10191021
#endif
10201022

10211023
REQUIRE(h.setOptionValue(kMipLpSolverString, kIpxString) == HighsStatus::kOk);
@@ -1031,9 +1033,11 @@ TEST_CASE("mip-lp-solver-string", "[highs_test_mip_solver]") {
10311033
HighsStatus::kOk);
10321034

10331035
#ifdef HIPO
1034-
REQUIRE(h.setOptionValue(kMipIpmSolverString, kHipoString) == HighsStatus::kOk);
1036+
REQUIRE(h.setOptionValue(kMipIpmSolverString, kHipoString) ==
1037+
HighsStatus::kOk);
10351038
#else
1036-
REQUIRE(h.setOptionValue(kMipIpmSolverString, kHipoString) == HighsStatus::kError);
1039+
REQUIRE(h.setOptionValue(kMipIpmSolverString, kHipoString) ==
1040+
HighsStatus::kError);
10371041
#endif
10381042

10391043
REQUIRE(h.setOptionValue(kMipIpmSolverString, kIpxString) ==

highs/lp_data/Highs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ HighsStatus Highs::optimizeModel() {
12491249
const bool ipm_no_crossover =
12501250
useIpm(options_.solver) && options_.run_crossover == kHighsOffString;
12511251
const bool lp_no_solution_basis =
1252-
ipm_no_crossover || options_.solver == kPdlpString;
1252+
ipm_no_crossover || options_.solver == kPdlpString;
12531253
if (options_.icrash) {
12541254
ICrashStrategy strategy = ICrashStrategy::kICA;
12551255
bool strategy_ok = parseICrashStrategy(options_.icrash_strategy, strategy);

0 commit comments

Comments
 (0)