Use mipworker cutpool in separation

Author: Opt-Mucca

highs/mip/HighsMipSolver.cpp

@@ -351,6 +351,8 @@ void HighsMipSolver::run() {
                                            options_mip_->mip_pool_soft_limit);
       master_worker.conflictpool_ = mipdata_->conflictpools.back();
     } else {
+      master_worker.cutpool_ = &mipdata_->cutpools[1];
+      master_worker.conflictpool_ = mipdata_->conflictpools[1];
       recreatePools(1, master_worker);
     }
     master_worker.upper_bound = mipdata_->upper_bound;
@@ -703,11 +705,11 @@ void HighsMipSolver::run() {
       if (i != 0) continue;
       if (mipdata_->parallelLockActive()) {
         tg.spawn([&, i]() {
-          mipdata_->workers[i].sepa_ptr_->separate(mipdata_->workers[i], mipdata_->workers[i].search_ptr_->getLocalDomain());
+          mipdata_->workers[i].sepa_ptr_->separate(
+              mipdata_->workers[i].search_ptr_->getLocalDomain());
         });
       } else {
         mipdata_->workers[i].sepa_ptr_->separate(
-            mipdata_->workers[i],
             mipdata_->workers[i].search_ptr_->getLocalDomain());
       }
     }

highs/mip/HighsMipSolverData.cpp

@@ -1386,6 +1386,12 @@ void HighsMipSolverData::performRestart() {
   // HighsNodeQueue oldNodeQueue;
   // std::swap(nodequeue, oldNodeQueue);
 
+  // Ensure master worker is pointing to the correct cut and conflict pools
+  if (mipsolver.options_mip_->mip_search_concurrency > 1) {
+    mipsolver.mipdata_->workers[0].cutpool_ = &cutpool;
+    mipsolver.mipdata_->workers[0].conflictpool_ = conflictPool;
+  }
+
   // remove the pointer into the stack-space of this function
   if (mipsolver.rootbasis == &root_basis) mipsolver.rootbasis = nullptr;
   mipsolver.pscostinit = nullptr;

highs/mip/HighsSeparation.cpp

@@ -86,8 +86,9 @@ HighsInt HighsSeparation::separationRound(HighsDomain& propdomain,
   // additional probing in parallel case
   if (&propdomain == &mipdata.domain) {
     lp->getMipSolver().timer_.start(implBoundClock);
-    mipdata.implications.separateImpliedBounds(
-        *lp, lp->getSolution().col_value, mipdata.cutpool, mipdata.feastol);
+    mipdata.implications.separateImpliedBounds(*lp, lp->getSolution().col_value,
+                                               *mipworker_.cutpool_,
+                                               mipdata.feastol);
     lp->getMipSolver().timer_.stop(implBoundClock);
   }
 
@@ -103,7 +104,7 @@ HighsInt HighsSeparation::separationRound(HighsDomain& propdomain,
   if (&propdomain == &mipdata.domain) {
     lp->getMipSolver().timer_.start(cliqueClock);
     mipdata.cliquetable.separateCliques(lp->getMipSolver(), sol.col_value,
-                                        mipdata.cutpool, mipdata.feastol);
+                                        *mipworker_.cutpool_, mipdata.feastol);
     lp->getMipSolver().timer_.stop(cliqueClock);
   }
 
@@ -124,7 +125,7 @@ HighsInt HighsSeparation::separationRound(HighsDomain& propdomain,
   HighsLpAggregator lpAggregator(*lp);
 
   for (const std::unique_ptr<HighsSeparator>& separator : separators) {
-    separator->run(*lp, lpAggregator, transLp, mipdata.cutpool);
+    separator->run(*lp, lpAggregator, transLp, *mipworker_.cutpool_);
     if (mipworker_.globaldom_.infeasible()) {
       status = HighsLpRelaxation::Status::kInfeasible;
       return 0;
@@ -137,8 +138,8 @@ HighsInt HighsSeparation::separationRound(HighsDomain& propdomain,
   else
     ncuts += numboundchgs;
 
-  mipdata.cutpool.separate(sol.col_value, propdomain, cutset,
-                           mipdata.feastol, mipdata.cutpools);
+  mipworker_.cutpool_->separate(sol.col_value, propdomain, cutset,
+                                mipdata.feastol, mipdata.cutpools);
 
   if (cutset.numCuts() > 0) {
     ncuts += cutset.numCuts();
@@ -158,8 +159,7 @@ HighsInt HighsSeparation::separationRound(HighsDomain& propdomain,
   return ncuts;
 }
 
-void HighsSeparation::separate(HighsMipWorker& worker,
-                               HighsDomain& propdomain) {
+void HighsSeparation::separate(HighsDomain& propdomain) {
   HighsLpRelaxation::Status status = lp->getStatus();
   const HighsMipSolver& mipsolver = lp->getMipSolver();
 
@@ -179,7 +179,7 @@ void HighsSeparation::separate(HighsMipWorker& worker,
       // mipsolver.mipdata_->total_lp_iterations += nlpiters;
 
       // todo:ig  more stats for separation iterations?
-      worker.heur_stats.lp_iterations += nlpiters;
+      mipworker_.heur_stats.lp_iterations += nlpiters;
 
       // printf("separated %" HIGHSINT_FORMAT " cuts\n", ncuts);
 
@@ -206,6 +206,6 @@ void HighsSeparation::separate(HighsMipWorker& worker,
 
     // mipsolver.mipdata_->cutpool.performAging();
     // ig: using worker cutpool
-    worker.cutpool_->performAging();
+    mipworker_.cutpool_->performAging();
   }
 }

highs/mip/HighsSeparation.h

@@ -26,7 +26,7 @@ class HighsSeparation {
                            HighsLpRelaxation::Status& status);
 
   // void separate(HighsDomain& propdomain);
-  void separate(HighsMipWorker& worker, HighsDomain& propdomain);
+  void separate(HighsDomain& propdomain);
 
   void setLpRelaxation(HighsLpRelaxation* lp) { this->lp = lp; }
 

highs/mip/HighsTransformedLp.cpp

@@ -35,7 +35,7 @@ HighsTransformedLp::HighsTransformedLp(const HighsLpRelaxation& lprelaxation,
   vectorsum.setDimension(numTransformedCol);
 
   for (HighsInt col : mipsolver.mipdata_->continuous_cols) {
-    if (mipsolver.mipdata_->workers.size() <= 1)
+    if (!mipsolver.mipdata_->parallelLockActive())
       mipsolver.mipdata_->implications.cleanupVarbounds(col);
 
     if (globaldom_.infeasible()) return;
@@ -66,7 +66,7 @@ HighsTransformedLp::HighsTransformedLp(const HighsLpRelaxation& lprelaxation,
     double bestub = globaldom_.col_upper_[col];
     double bestlb = globaldom_.col_lower_[col];
 
-    if (mipsolver.mipdata_->workers.size() <= 1)
+    if (!mipsolver.mipdata_->parallelLockActive())
       mipsolver.mipdata_->implications.cleanupVarbounds(col);
 
     if (globaldom_.infeasible()) return;