Skip to content

Commit f01c30c

Browse files
committed
Fixed two issues leading to CI compiler failures
1 parent bf92e1c commit f01c30c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

highs/mip/HighsMipSolverData.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2668,9 +2668,9 @@ void HighsMipSolverData::queryExternalSolution(
26682668
if (!mipsolver.options_mip_->mip_race_read_solutions) return;
26692669
MipRace& mip_race = mipsolver.mip_race_;
26702670
if (!mip_race.record) return;
2671-
double instance_solution_objective_value;
2671+
double instance_solution_objective_value = kHighsInf;
26722672
std::vector<double> instance_solution;
2673-
for (HighsInt instance = 0; instance < mip_race.concurrency(); instance++) {
2673+
for (HighsInt instance = 0; instance < mipRaceConcurrency(); instance++) {
26742674
if (instance == mip_race.my_instance) continue;
26752675
if (!mip_race.newSolution(instance, instance_solution_objective_value,
26762676
instance_solution))
@@ -2686,7 +2686,7 @@ void HighsMipSolverData::queryExternalSolution(
26862686

26872687
HighsInt HighsMipSolverData::mipRaceConcurrency() const {
26882688
assert(!mipsolver.submip);
2689-
if (!mipsolver.mip_race_.record) return;
2689+
if (!mipsolver.mip_race_.record) return 0;
26902690
return mipsolver.mip_race_.concurrency();
26912691
}
26922692

@@ -2965,7 +2965,7 @@ void MipRace::initialise(const HighsInt mip_race_concurrency,
29652965

29662966
HighsInt MipRace::concurrency() const {
29672967
assert(this->record);
2968-
return static_cast<HighsInt>(this->last_incumbent_read.size());
2968+
return this->record->concurrency();
29692969
}
29702970

29712971
void MipRace::update(const double objective,

0 commit comments

Comments
 (0)