Add sync pools

Author: Opt-Mucca

highs/mip/HighsMipSolver.cpp

@@ -340,7 +340,7 @@ void HighsMipSolver::run() {
 
   // (Re-)Initialise local cut and conflict pool for master worker
   if (mip_search_concurrency > 1) {
-    if (mipdata_->numRestarts <= mipdata_->numRestartsRoot) {
+    if (mipdata_->cutpools.size() <= 1) {
       mipdata_->cutpools.emplace_back(numCol(),
                                       options_mip_->mip_pool_age_limit,
                                       options_mip_->mip_pool_soft_limit, 1);
@@ -358,7 +358,7 @@ void HighsMipSolver::run() {
 
   // Create / re-initialise workers
   for (int i = 1; i < mip_search_concurrency; i++) {
-    if (mipdata_->numRestarts <= mipdata_->numRestartsRoot) {
+    if (mipdata_->workers.size() <= i) {
       mipdata_->domains.emplace_back(mipdata_->domain);
       mipdata_->lps.emplace_back(mipdata_->lp, i);
       mipdata_->cutpools.emplace_back(numCol(),
@@ -1010,6 +1010,7 @@ void HighsMipSolver::run() {
     analysis_.mipTimerStart(kMipClockDomainPropgate);
     // sync global domain changes from parallel dives
     syncGlobalDomain();
+    syncPools();
     mipdata_->domain.propagate();
     analysis_.mipTimerStop(kMipClockDomainPropgate);
 

highs/mip/HighsMipSolverData.cpp

@@ -27,8 +27,9 @@ HighsMipSolverData::HighsMipSolverData(HighsMipSolver& mipsolver)
       lp(lps.at(0)),
       cutpools(),
       cutpool(*cutpools.emplace(cutpools.end(), mipsolver.numCol(),
-                               mipsolver.options_mip_->mip_pool_age_limit,
-                               mipsolver.options_mip_->mip_pool_soft_limit, 0)),
+                                mipsolver.options_mip_->mip_pool_age_limit,
+                                mipsolver.options_mip_->mip_pool_soft_limit,
+                                0)),
       conflictpools(
           1, HighsConflictPool(5 * mipsolver.options_mip_->mip_pool_age_limit,
                                mipsolver.options_mip_->mip_pool_soft_limit)),
@@ -1359,6 +1360,7 @@ void HighsMipSolverData::performRestart() {
     // is never applied, since MIP solving is complete, and
     // lower_bound is set to upper_bound, so apply the offset now, so
     // that housekeeping in updatePrimalDualIntegral is correct
+    // MT: If the model is optimal after presolve, then don't check prev data
     double prev_lower_bound = lower_bound - mipsolver.model_->offset_;
 
     lower_bound = upper_bound;
@@ -1370,8 +1372,9 @@ void HighsMipSolverData::performRestart() {
     bool bound_change = lower_bound != prev_lower_bound;
     assert(bound_change);
     if (!mipsolver.submip && bound_change)
-      updatePrimalDualIntegral(prev_lower_bound, lower_bound, upper_bound,
-                               upper_bound);
+      updatePrimalDualIntegral(
+          prev_lower_bound, lower_bound, upper_bound, upper_bound, true,
+          mipsolver.modelstatus_ != HighsModelStatus::kOptimal);
     if (mipsolver.solution_objective_ != kHighsInf &&
         mipsolver.modelstatus_ == HighsModelStatus::kInfeasible)
       mipsolver.modelstatus_ = HighsModelStatus::kOptimal;