Increase numlps when copying an LP

Author: Opt-Mucca

highs/mip/HighsCutPool.cpp

@@ -578,7 +578,6 @@ HighsInt HighsCutPool::addCut(const HighsMipSolver& mipsolver, HighsInt* Rindex,
     rhs_.resize(rowindex + 1);
     ages_.resize(rowindex + 1);
     numLps_.resize(rowindex + 1);
-    numLps_[rowindex] = -1;
     rownormalization_.resize(rowindex + 1);
     maxabscoef_.resize(rowindex + 1);
     rowintegral.resize(rowindex + 1);
@@ -589,6 +588,7 @@ HighsInt HighsCutPool::addCut(const HighsMipSolver& mipsolver, HighsInt* Rindex,
   ages_[rowindex] = std::max(HighsInt{0}, agelim_ - 5);
   ++ageDistribution[ages_[rowindex]];
   rowintegral[rowindex] = integral;
+  numLps_[rowindex] = -1;
   if (propagate) propRows.emplace(ages_[rowindex], rowindex);
   assert((HighsInt)propRows.size() == numPropRows);
 

highs/mip/HighsCutPool.h

@@ -146,6 +146,11 @@ class HighsCutPool {
     ageDistribution.resize(agelim_ + 1);
   }
 
+  void increaseNumLps(HighsInt cut, HighsInt n) {
+    assert(numLps_[cut] >= 1);
+    numLps_[cut].fetch_add(n, std::memory_order_relaxed);
+  };
+
   void separate(const std::vector<double>& sol, HighsDomain& domprop,
                 HighsCutSet& cutset, double feastol,
                 const std::deque<HighsCutPool>& cutpools,

highs/mip/HighsLpRelaxation.cpp

@@ -659,6 +659,18 @@ void HighsLpRelaxation::resetAges() {
   }
 }
 
+void HighsLpRelaxation::notifyCutPoolsLpCopied(HighsInt n) {
+  HighsInt nlprows = numRows();
+  HighsInt modelrows = mipsolver.numRow();
+  for (HighsInt i = modelrows; i != nlprows; ++i) {
+    if (lprows[i].origin == LpRow::Origin::kCutPool) {
+      assert(lprows[i].cutpool <= mipsolver.mipdata_->cutpools.size());
+      mipsolver.mipdata_->cutpools[lprows[i].cutpool].increaseNumLps(
+          lprows[i].index, n);
+    }
+  }
+}
+
 void HighsLpRelaxation::flushDomain(HighsDomain& domain, bool continuous) {
   if (!domain.getChangedCols().empty()) {
     if (&domain == &mipsolver.mipdata_->domain) continuous = true;

highs/mip/HighsLpRelaxation.h

@@ -311,6 +311,8 @@ class HighsLpRelaxation {
 
   void resetAges();
 
+  void notifyCutPoolsLpCopied(HighsInt n);
+
   void removeObsoleteRows(bool notifyPool = true);
 
   void removeCuts(HighsInt ndelcuts, std::vector<HighsInt>& deletemask);

highs/mip/HighsMipSolver.cpp

@@ -377,6 +377,9 @@ void HighsMipSolver::run() {
     }
     mipdata_->workers[i].upper_bound = mipdata_->upper_bound;
   }
+  if (mip_search_concurrency > 1) {
+    mipdata_->lp.notifyCutPoolsLpCopied(mip_search_concurrency - 1);
+  }
 
   // Lambda for combining limit_reached across searches
   auto limitReached = [&]() -> bool {
@@ -448,8 +451,13 @@ void HighsMipSolver::run() {
     for (HighsMipWorker& worker : mipdata_->workers) {
       const auto& domchgstack = worker.globaldom_.getDomainChangeStack();
       for (const HighsDomainChange& domchg : domchgstack) {
-        mipdata_->domain.changeBound(domchg,
-                                     HighsDomain::Reason::unspecified());
+        if ((domchg.boundtype == HighsBoundType::kLower &&
+             domchg.boundval > mipdata_->domain.col_lower_[domchg.column]) ||
+            (domchg.boundtype == HighsBoundType::kUpper &&
+                domchg.boundval < mipdata_->domain.col_upper_[domchg.column])) {
+            mipdata_->domain.changeBound(domchg,
+                                         HighsDomain::Reason::unspecified());
+          }
       }
     }
   };