Skip to content

Commit 9948f3c

Browse files
committed
Not so ambitious...
1 parent 26e930b commit 9948f3c

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

highs/lp_data/Highs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4042,7 +4042,7 @@ HighsStatus Highs::callSolveMip() {
40424042
MipRaceRecord mip_race_record;
40434043
mip_race_record.initialise(mip_race_concurrency, lp.num_col_);
40444044
// Set up the shared memory for the concurrent MIP terminator
4045-
auto terminator_record = solver.initialiseRecord(mip_race_concurrency);
4045+
auto terminator_record = solver.initialiseTerminatorRecord(mip_race_concurrency);
40464046
// Don't allow callbacks for workers
40474047
HighsCallback worker_callback = callback_;
40484048
worker_callback.clear();

highs/mip/HighsMipSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ void HighsMipSolver::initialiseTerminator(HighsInt num_instance_,
999999
this->terminator_.initialise(num_instance_, my_instance_, record_);
10001000
}
10011001

1002-
std::vector<HighsModelStatus> HighsMipSolver::initialiseRecord(
1002+
std::vector<HighsModelStatus> HighsMipSolver::initialiseTerminatorRecord(
10031003
HighsInt num_instance) const {
10041004
std::vector<HighsModelStatus> record(num_instance, HighsModelStatus::kNotset);
10051005
return record;

highs/mip/HighsMipSolver.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ class HighsMipSolver {
165165
const std::vector<double>* pass_row_value,
166166
double& bound_violation, double& row_violation,
167167
double& integrality_violation, HighsCDouble& obj) const;
168-
std::vector<HighsModelStatus> initialiseRecord(HighsInt num_instance) const;
168+
169+
std::vector<HighsModelStatus> initialiseTerminatorRecord(HighsInt num_instance) const;
169170
void initialiseTerminator(HighsInt num_instance_ = 0,
170171
HighsInt my_instance_ = kNoThreadInstance,
171172
HighsModelStatus* record_ = nullptr);

0 commit comments

Comments
 (0)