Pass local conflict pool to redcost propagation

Author: Opt-Mucca

highs/mip/HighsRedcostFixing.cpp

@@ -76,7 +76,8 @@ void HighsRedcostFixing::propagateRootRedcost(const HighsMipSolver& mipsolver) {
 void HighsRedcostFixing::propagateRedCost(const HighsMipSolver& mipsolver,
                                           HighsDomain& localdomain,
                                           HighsDomain& globaldom,
-                                          const HighsLpRelaxation& lp) {
+                                          const HighsLpRelaxation& lp,
+                                          HighsConflictPool& conflictpool) {
   const std::vector<double>& lpredcost = lp.getSolution().col_dual;
   double lpobjective = lp.getObjective();
   HighsCDouble gap =
@@ -151,29 +152,25 @@ void HighsRedcostFixing::propagateRedCost(const HighsMipSolver& mipsolver,
                             vals, rhs, false)) {
       bool addedConstraints = false;
 
-      if (mipsolver.mipdata_->workers.size() <= 1) {
-        HighsInt oldNumConflicts =
-            mipsolver.mipdata_->conflictPool.getNumConflicts();
-        for (const HighsDomainChange& domchg : boundChanges) {
-          if (localdomain.isActive(domchg)) continue;
-          localdomain.conflictAnalyzeReconvergence(
-              domchg, inds.data(), vals.data(), inds.size(), rhs,
-              mipsolver.mipdata_->conflictPool, globaldom);
-        }
-        addedConstraints = mipsolver.mipdata_->conflictPool.getNumConflicts() !=
-                           oldNumConflicts;
-
-        if (addedConstraints) {
-          localdomain.propagate();
-          if (localdomain.infeasible()) return;
-
-          boundChanges.erase(
-              std::remove_if(boundChanges.begin(), boundChanges.end(),
-                             [&](const HighsDomainChange& domchg) {
-                               return localdomain.isActive(domchg);
-                             }),
-              boundChanges.end());
-        }
+      HighsInt oldNumConflicts = conflictpool.getNumConflicts();
+      for (const HighsDomainChange& domchg : boundChanges) {
+        if (localdomain.isActive(domchg)) continue;
+        localdomain.conflictAnalyzeReconvergence(domchg, inds.data(),
+                                                 vals.data(), inds.size(), rhs,
+                                                 conflictpool, globaldom);
+      }
+      addedConstraints = conflictpool.getNumConflicts() != oldNumConflicts;
+
+      if (addedConstraints) {
+        localdomain.propagate();
+        if (localdomain.infeasible()) return;
+
+        boundChanges.erase(
+            std::remove_if(boundChanges.begin(), boundChanges.end(),
+                           [&](const HighsDomainChange& domchg) {
+                             return localdomain.isActive(domchg);
+                           }),
+            boundChanges.end());
       }
 
       if (!boundChanges.empty()) {

highs/mip/HighsRedcostFixing.h

@@ -15,6 +15,7 @@
 #include <map>
 #include <vector>
 
+#include "HighsConflictPool.h"
 #include "mip/HighsDomainChange.h"
 
 class HighsDomain;
@@ -34,7 +35,8 @@ class HighsRedcostFixing {
   static void propagateRedCost(const HighsMipSolver& mipsolver,
                                HighsDomain& localdomain,
                                HighsDomain& globaldom,
-                               const HighsLpRelaxation& lp);
+                               const HighsLpRelaxation& lp,
+                               HighsConflictPool& conflictpool);
 
   void addRootRedcost(const HighsMipSolver& mipsolver,
                       const std::vector<double>& lpredcost, double lpobjective);

highs/mip/HighsSearch.cpp

@@ -1090,7 +1090,8 @@ HighsSearch::NodeResult HighsSearch::evaluateNode() {
                   &localdom);
             }
             HighsRedcostFixing::propagateRedCost(mipsolver, localdom,
-                                                 mipworker.globaldom_, *lp);
+                                                 mipworker.globaldom_, *lp,
+                                                 mipworker.conflictpool_);
             localdom.propagate();
             if (localdom.infeasible()) {
               result = NodeResult::kDomainInfeasible;