Fix clocks. Enable heuristics

Author: Opt-Mucca

highs/mip/HighsLpRelaxation.cpp

@@ -591,7 +591,7 @@ void HighsLpRelaxation::removeCuts(HighsInt ndelcuts,
     basis.debug_origin_name = "HighsLpRelaxation::removeCuts";
     lpsolver.setBasis(basis);
     lpsolver.run();
-    if (!mipsolver.submip) {
+    if (!mipsolver.submip && !mipsolver.mipdata_->parallelLockActive()) {
       const HighsSubSolverCallTime& sub_solver_call_time =
           lpsolver.getSubSolverCallTime();
       mipsolver.analysis_.addSubSolverCallTime(sub_solver_call_time);
@@ -1211,7 +1211,7 @@ HighsLpRelaxation::Status HighsLpRelaxation::run(bool resolve_on_error) {
   }
   // Revert the value of lpsolver.options_.solver
   lpsolver.setOptionValue("solver", solver);
-  if (!mipsolver.submip) {
+  if (!mipsolver.submip && !mipsolver.mipdata_->parallelLockActive()) {
     const HighsSubSolverCallTime& sub_solver_call_time =
         lpsolver.getSubSolverCallTime();
     mipsolver.analysis_.addSubSolverCallTime(sub_solver_call_time);

highs/mip/HighsMipSolver.cpp

@@ -681,7 +681,6 @@ void HighsMipSolver::run() {
     };
     analysis_.mipTimerStart(kMipClockNodePrunedLoop);
     applyTask(doHandlePrunedNodes, tg, true, search_indices);
-    analysis_.mipTimerStop(kMipClockNodePrunedLoop);
     // Flush pruned nodes statistics that haven't yet been flushed
     for (HighsInt i = 0; i != n; ++i) {
       if (flush[i]) {
@@ -925,7 +924,7 @@ void HighsMipSolver::run() {
 
     // atm heuristics in the dive break lseu debug64
     // bool considerHeuristics = true;
-    bool considerHeuristics = false;
+    bool considerHeuristics = true;
 
     analysis_.mipTimerStart(kMipClockDive);
     while (true) {

highs/mip/HighsPrimalHeuristics.cpp

@@ -349,7 +349,6 @@ void HighsPrimalHeuristics::rootReducedCost(HighsMipWorker& worker) {
   double fixingRate = neighbourhood.getFixingRate();
   if (fixingRate < 0.3) return;
 
-  // mipsolver.analysis_.mipTimerStart(kMipClockSolveSubMipRootReducedCost);
   solveSubMip(worker, *mipsolver.model_, mipsolver.mipdata_->firstrootbasis,
               fixingRate, localdom.col_lower_, localdom.col_upper_,
               500,  // std::max(50, int(0.05 *