File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed
Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -580,13 +580,13 @@ void HighsMipSolver::run() {
580580
581581 considerHeuristics = false ;
582582
583- if (mipdata_-> parallelLockActive ()) syncSolutions ();
583+ syncSolutions ();
584584 if (infeasibleGlobalDomain ()) break ;
585585
586586 bool suboptimal = diveAllSearches ();
587587 if (suboptimal) break ;
588588
589- if (mipdata_-> parallelLockActive ()) syncSolutions ();
589+ syncSolutions ();
590590 if (mipdata_->checkLimits ()) {
591591 limit_reached = true ;
592592 break ;
@@ -635,7 +635,7 @@ void HighsMipSolver::run() {
635635 mipdata_->workers [i].search_ptr_ ->flushStatistics ();
636636 }
637637
638- if (mipdata_-> parallelLockActive ()) syncSolutions ();
638+ syncSolutions ();
639639
640640 if (limit_reached) {
641641 double prev_lower_bound = mipdata_->lower_bound ;
@@ -708,9 +708,7 @@ void HighsMipSolver::run() {
708708 mipdata_->implications .cleanupVarbounds (col);
709709
710710 mipdata_->domain .setDomainChangeStack (std::vector<HighsDomainChange>());
711- // resetDomains();
712- search.resetLocalDomain ();
713- mipdata_->domain .clearChangedCols ();
711+ resetDomains ();
714712
715713 mipdata_->removeFixedIndices ();
716714 analysis_.mipTimerStop (kMipClockUpdateLocalDomain );
You can’t perform that action at this time.
0 commit comments