Add more solution syncs. Fix wrong index and addincumbent call

Author: Opt-Mucca

highs/mip/HighsMipSolver.cpp

@@ -363,7 +363,7 @@ void HighsMipSolver::run() {
       mipdata_->lps.emplace_back(mipdata_->lp, i);
       mipdata_->cutpools.emplace_back(numCol(),
                                       options_mip_->mip_pool_age_limit,
-                                      options_mip_->mip_pool_soft_limit, i);
+                                      options_mip_->mip_pool_soft_limit, i + 1);
       mipdata_->conflictpools.emplace_back(5 * options_mip_->mip_pool_age_limit,
                                            options_mip_->mip_pool_soft_limit);
       mipdata_->workers.emplace_back(
@@ -721,6 +721,7 @@ void HighsMipSolver::run() {
     // due to parallelism)
     // TODO MT: Change the if statement
     // if (mipdata_->hasMultipleWorkers() && num_search_indices == 0) {
+    syncSolutions();
     if (mipdata_->hasMultipleWorkers() &&
         (num_search_indices == 0 || search_indices[0] != 0)) {
       double prev_lower_bound = mipdata_->lower_bound;
@@ -1153,6 +1154,7 @@ void HighsMipSolver::run() {
       // printf("popping node from nodequeue (length = %" HIGHSINT_FORMAT ")\n",
       // (HighsInt)nodequeue.size());
       std::vector<HighsInt> search_indices = getSearchIndicesWithNoNodes();
+      // TODO MT: Remove this line
       if (search_indices[0] != 0) break;
       // if (search_indices.size() >= mip_search_concurrency) break;
 
@@ -1174,6 +1176,7 @@ void HighsMipSolver::run() {
 
       bool infeasible = separateAndStoreBasis(search_indices);
       if (infeasible) break;
+      syncSolutions();
     }  // while(!mipdata_->nodequeue.empty())
     analysis_.mipTimerStop(kMipClockNodeSearch);
     if (analysis_.analyse_mip_time) {

highs/mip/HighsSearch.cpp

@@ -2031,10 +2031,10 @@ bool HighsSearch::addIncumbent(const std::vector<double>& sol, double solobj,
                                const bool print_display_line) {
   // if (mipsolver.mipdata_->workers.size() <= 1)
   if (mipsolver.mipdata_->parallelLockActive()) {
+    return mipworker.addIncumbent(sol, solobj, solution_source);
+  } else {
     return mipsolver.mipdata_->addIncumbent(sol, solobj, solution_source,
                                             print_display_line);
-  } else {
-    return mipworker.addIncumbent(sol, solobj, solution_source);
   }
   // dive part.
   // return mipworker.addIncumbent(sol, solobj, solution_source,