Revert cmir change. Fix min eff calc

Author: Opt-Mucca

highs/mip/HighsCutGeneration.cpp

@@ -806,7 +806,7 @@ bool HighsCutGeneration::cmirCutGenerationHeuristic(double minEfficacy,
 
   deltas.erase(std::remove(deltas.begin(), deltas.end(), 0.0), deltas.end());
   double bestdelta = -1;
-  double bestefficacy = feastol;
+  double bestefficacy = minEfficacy;
 
   for (double delta : deltas) {
     double scale = 1.0 / delta;
@@ -916,8 +916,6 @@ bool HighsCutGeneration::cmirCutGenerationHeuristic(double minEfficacy,
     }
   }
 
-  if (bestefficacy < minEfficacy) return false;
-
   HighsCDouble scale = 1.0 / HighsCDouble(bestdelta);
   HighsCDouble scalrhs = rhs * scale;
   double downrhs = floor(double(scalrhs));
@@ -1953,7 +1951,7 @@ bool HighsCutGeneration::tryGenerateCut(std::vector<HighsInt>& inds_,
       rhs = tmpRhs;
     } else {
       // accept cut and increase minimum efficiency requirement for cmir cut
-      minMirEfficacy += feastol;
+      minMirEfficacy = std::max(minEfficacy, efficacy) + feastol;
       std::swap(tmpRhs, rhs);
     }
   }