Skip to content

Commit 6ac2ee0

Browse files
committed
ctest passes with HIPO=off
1 parent f0ddd25 commit 6ac2ee0

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

highs/lp_data/HighsSolve.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ HighsStatus solveLp(HighsLpSolverObject& solver_object, const string message) {
3737
if (return_status == HighsStatus::kError) return return_status;
3838
}
3939
const bool use_only_ipm = useIpm(options.solver) || options.run_centring;
40-
const bool use_hipo = useHipo(options, kSolverString, solver_object.lp_);
40+
bool use_hipo = useHipo(options, kSolverString, solver_object.lp_);
41+
#ifndef HIPO
42+
// Shouldn't be possible to choose HiPO if it's not in the build
43+
assert(!use_hipo);
44+
use_hipo = false;
45+
#endif
4146
const bool use_ipx = use_only_ipm && !use_hipo;
4247
// Now actually solve LPs!
4348
//

highs/mip/HighsLpRelaxation.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,9 @@ HighsLpRelaxation::Status HighsLpRelaxation::run(bool resolve_on_error) {
12921292
// here. Later pass mip_ipm_solver and take action on failure in
12931293
// solveLp
12941294
bool use_hipo =
1295+
#ifdef HIPO
12951296
mip_ipm_solver == kHighsChooseString ||
1297+
#endif
12961298
mip_ipm_solver == kHipoString;
12971299
#ifndef HIPO
12981300
// Shouldn't be possible to choose HiPO if it's not in the build

highs/mip/HighsMipSolverData.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,9 @@ void HighsMipSolverData::startAnalyticCenterComputation(
357357
// here. Later pass mip_ipm_solver and take action on failure in
358358
// solveLp
359359
bool use_hipo =
360+
#ifdef HIPO
360361
mip_ipm_solver == kHighsChooseString ||
362+
#endif
361363
mip_ipm_solver == kHipoString;
362364
#ifndef HIPO
363365
// Shouldn't be possible to choose HiPO if it's not in the build

0 commit comments

Comments
 (0)