Skip to content

Commit 1df4aa5

Browse files
committed
setOptions does not return a status
1 parent 4289974 commit 1df4aa5

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

highs/ipm/IpxWrapper.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,10 +476,7 @@ HighsStatus solveHipo(const HighsOptions& options, HighsTimer& timer,
476476
1e-1 * options.kkt_tolerance);
477477
}
478478

479-
if (hipo.setOptions(options)) {
480-
model_status = HighsModelStatus::kSolveError;
481-
return HighsStatus::kError;
482-
}
479+
hipo.setOptions(options);
483480
hipo.setTimer(timer);
484481
hipo.setCallback(callback);
485482

highs/ipm/hipo/ipm/Solver.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Int Solver::load(const HighsLp& lp, const HighsHessian& Q) {
1919
return kStatusOk;
2020
}
2121

22-
Int Solver::setOptions(const HighsOptions& highs_options) {
22+
void Solver::setOptions(const HighsOptions& highs_options) {
2323
options_.display = true;
2424
if (!highs_options.output_flag | !highs_options.log_to_console)
2525
options_.display = false;
@@ -56,8 +56,6 @@ Int Solver::setOptions(const HighsOptions& highs_options) {
5656
options_orig_ = options_;
5757
Hoptions_ = highs_options;
5858
resetOptions();
59-
60-
return kStatusOk;
6159
}
6260

6361
void Solver::resetOptions() {

highs/ipm/hipo/ipm/Solver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class Solver {
8585
// ===================================================================================
8686
// Specify options, callback and timer.
8787
// ===================================================================================
88-
Int setOptions(const HighsOptions& highs_options);
88+
void setOptions(const HighsOptions& highs_options);
8989
void setCallback(HighsCallback& callback);
9090
void setTimer(const HighsTimer& timer);
9191

0 commit comments

Comments
 (0)