Skip to content

Commit 6ec6465

Browse files
committed
Replace more global domain usages
1 parent 05c430e commit 6ec6465

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

highs/mip/HighsPrimalHeuristics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ void HighsPrimalHeuristics::feasibilityPump(HighsMipWorker& worker) {
14801480
std::vector<HighsInt> referencepoint;
14811481
referencepoint.reserve(mipsolver.mipdata_->integer_cols.size());
14821482

1483-
auto localdom = mipsolver.mipdata_->domain;
1483+
auto localdom = worker.globaldom_;
14841484
for (HighsInt i : mipsolver.mipdata_->integer_cols) {
14851485
assert(mipsolver.variableType(i) == HighsVarType::kInteger);
14861486
double intval = std::floor(roundedsol[i] + worker.randgen.real(0.4, 0.6));

highs/presolve/HPresolve.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,8 @@ void HPresolve::shrinkProblem(HighsPostsolveStack& postsolve_stack) {
925925
if (mipsolver != nullptr) {
926926
mipsolver->mipdata_->rowMatrixSet = false;
927927
mipsolver->mipdata_->objectiveFunction = HighsObjectiveFunction(*mipsolver);
928-
mipsolver->mipdata_->domain = HighsDomain(*mipsolver);
928+
mipsolver->mipdata_->domains[0] = HighsDomain(*mipsolver);
929+
mipsolver->mipdata_->domain = mipsolver->mipdata_->domains.at(0);
929930
mipsolver->mipdata_->cliquetable.rebuild(model->num_col_, postsolve_stack,
930931
mipsolver->mipdata_->domain,
931932
newColIndex, newRowIndex);

0 commit comments

Comments
 (0)