Skip to content

Commit fd13d2f

Browse files
committed
Remove redundant line. Fix order of calls
1 parent e3ee17c commit fd13d2f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

highs/mip/HighsMipSolver.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ void HighsMipSolver::run() {
363363
};
364364

365365
// TODO: Should we be propagating this first?
366-
if (num_workers > 1) resetGlobalDomain(true);
367366
destroyOldWorkers();
367+
if (num_workers > 1) resetGlobalDomain(true);
368368
if (num_workers > 1) constructAdditionalWorkerData(master_worker);
369369
master_worker.upper_bound = mipdata_->upper_bound;
370370
master_worker.upper_limit = mipdata_->upper_limit;
@@ -465,14 +465,13 @@ void HighsMipSolver::run() {
465465
};
466466

467467
auto resetWorkerDomains = [&]() -> void {
468-
// 1. Backtrack to global domain for all local global domains
468+
// 1. Backtrack to global domain for all local global domains (not needed)
469469
// 2. Push all changes from the true global domain
470470
// 3. Clear changedCols and domChgStack, and reset local search domain for
471471
// all workers
472472
// TODO MT: Is it simpler to just copy the domain each time
473473
if (mipdata_->hasMultipleWorkers()) {
474474
for (HighsMipWorker& worker : mipdata_->workers) {
475-
worker.globaldom_->backtrackToGlobal();
476475
for (const HighsDomainChange& domchg :
477476
mipdata_->domain.getDomainChangeStack()) {
478477
worker.getGlobalDomain().changeBound(

0 commit comments

Comments
 (0)