dont evaluate node if valid branch. add limits

Author: Opt-Mucca

highs/mip/HighsMipSolverData.cpp

@@ -2227,12 +2227,16 @@ void HighsMipSolverData::evaluateRootNode() {
     if (rootlpsol.empty()) break;
     if (upper_limit != kHighsInf && !moreHeuristicsAllowed()) break;
 
-    if (mipsolver.options_mip_->mip_heuristic_run_fix_and_propagate) {
+    // TODO: Find a way to make sure this is only called once
+    if (mipsolver.options_mip_->mip_heuristic_run_fix_and_propagate &&
+      numRestarts <= 0 && !mipsolver.submip) {
       analysis.mipTimerStart(kMipClockRootHeuristicsFixAndPropagate);
       heuristics.fixAndPropagate();
       analysis.mipTimerStop(kMipClockRootHeuristicsFixAndPropagate);
       heuristics.flushStatistics();
-    }
+      }
+
+    if (checkLimits()) return clockOff(analysis);
 
     if (mipsolver.options_mip_->mip_heuristic_run_root_reduced_cost) {
       analysis.mipTimerStart(kMipClockRootHeuristicsReducedCost);

highs/mip/HighsPrimalHeuristics.cpp

@@ -421,6 +421,7 @@ void HighsPrimalHeuristics::RENS(const std::vector<double>& tmp) {
         heur.branchDownwards(i, upval, upval + 0.5);
         localdom.propagate();
         if (localdom.infeasible()) {
+          // TODO: Is this needed? Won't evaluateNode catch the conflict analysis?
           localdom.conflictAnalysis(mipsolver.mipdata_->conflictPool);
           break;
         }
@@ -1594,24 +1595,28 @@ void HighsPrimalHeuristics::fixAndPropagate() {
   HighsInt numpropagationcalls = 0;
   const HighsInt kMaxPropagationCalls = std::max(
     1000, 2 * static_cast<int>(intcols.size()));
+  bool evaluatenode = true;
 
   // Continue branching and propagating until either (a) limit is hit,
   // (b) backtracked to root, or (c) reached a potentially feasible leaf
   while (true) {
-    heur.evaluateNode();
-    // printf("done evaluating node\n");
-    if (heur.currentNodePruned()) {
-      if (mipsolver.mipdata_->domain.infeasible()) {
-        lp_iterations += heur.getLocalLpIterations();
-        return;
-      }
+    if (evaluatenode) {
+      heur.evaluateNode();
+      // printf("done evaluating node\n");
+      if (heur.currentNodePruned()) {
+        if (mipsolver.mipdata_->domain.infeasible()) {
+          lp_iterations += heur.getLocalLpIterations();
+          return;
+        }
 
-      // TODO: Is this case only reached when the root is infeasible?
-      if (!heur.backtrack()) {
-        lp_iterations += heur.getLocalLpIterations();
-        return;
+        // TODO: Is this case only reached when the root is infeasible?
+        if (!heur.backtrack()) {
+          lp_iterations += heur.getLocalLpIterations();
+          return;
+        }
       }
     }
+    evaluatenode = false;
     bool branched = false;
     for (HighsInt col : diveperm) {
       if (numpropagationcalls > kMaxPropagationCalls) {
@@ -1670,6 +1675,7 @@ void HighsPrimalHeuristics::fixAndPropagate() {
       ++numpropagationcalls;
       if (localdom.infeasible()) {
         localdom.conflictAnalysis(mipsolver.mipdata_->conflictPool);
+        evaluatenode = true;
         break;
       }
     }