Add genflowcover param

Author: Opt-Mucca

highs/mip/HighsCutGeneration.cpp

@@ -1302,7 +1302,8 @@ static void checkNumerics(const double* vals, HighsInt len, double rhs) {
 bool HighsCutGeneration::generateCut(HighsTransformedLp& transLp,
                                      std::vector<HighsInt>& inds_,
                                      std::vector<double>& vals_, double& rhs_,
-                                     bool onlyInitialCMIRScale) {
+                                     bool onlyInitialCMIRScale,
+                                     bool genFlowCover) {
 #if 0
   if (vals_.size() > 1) {
     std::vector<HighsInt> indsCheck_ = inds_;
@@ -1352,7 +1353,7 @@ bool HighsCutGeneration::generateCut(HighsTransformedLp& transLp,
   std::vector<HighsInt> flowCoverInds;
   double flowCoverRhs = rhs_;
   double flowCoverEfficacy = 0;
-  if (!onlyInitialCMIRScale) {
+  if (genFlowCover) {
     flowCoverVals = vals_;
     flowCoverInds = inds_;
     flowCoverSuccess = tryGenerateFlowCoverCut(

highs/mip/HighsCutGeneration.h

@@ -104,7 +104,8 @@ class HighsCutGeneration {
   /// separates the LP solution for the given single row relaxation
   bool generateCut(HighsTransformedLp& transLp, std::vector<HighsInt>& inds,
                    std::vector<double>& vals, double& rhs,
-                   bool onlyInitialCMIRScale = false);
+                   bool onlyInitialCMIRScale = false,
+                   bool genFlowCover = false);
 
   /// generate a conflict from the given proof constraint which cuts of the
   /// given local domain

highs/mip/HighsModkSeparator.cpp

@@ -226,7 +226,7 @@ void HighsModkSeparator::separateLpSolution(HighsLpRelaxation& lpRelaxation,
     lpAggregator.getCurrentAggregation(inds, vals, false);
 
     rhs = 0.0;
-    cutGen.generateCut(transLp, inds, vals, rhs, true);
+    cutGen.generateCut(transLp, inds, vals, rhs, true, false);
 
     if (k != 2) {
       lpAggregator.clear();
@@ -240,7 +240,7 @@ void HighsModkSeparator::separateLpSolution(HighsLpRelaxation& lpRelaxation,
     lpAggregator.getCurrentAggregation(inds, vals, true);
 
     rhs = 0.0;
-    cutGen.generateCut(transLp, inds, vals, rhs, true);
+    cutGen.generateCut(transLp, inds, vals, rhs, true, false);
 
     lpAggregator.clear();
   };

highs/mip/HighsPathSeparator.cpp

@@ -350,7 +350,7 @@ void HighsPathSeparator::separateLpSolution(HighsLpRelaxation& lpRelaxation,
 
         // generate cut
         double rhs = 0;
-        success = cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs);
+        success = cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs, false, true);
 
         lpAggregator.getCurrentAggregation(baseRowInds, baseRowVals, true);
         if (!aggregatedPath.empty() || bestOutArcCol != -1 ||
@@ -359,7 +359,7 @@ void HighsPathSeparator::separateLpSolution(HighsLpRelaxation& lpRelaxation,
 
         // generate reverse cut
         rhs = 0;
-        success |= cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs);
+        success |= cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs, false, true);
 
         if (success || (bestOutArcCol == -1 && bestInArcCol == -1)) break;
 

highs/mip/HighsTableauSeparator.cpp

@@ -229,12 +229,12 @@ void HighsTableauSeparator::separateLpSolution(HighsLpRelaxation& lpRelaxation,
         baseRowInds.size());
 
     double rhs = 0;
-    cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs);
+    cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs, false, true);
     if (mip.mipdata_->domain.infeasible()) break;
 
     lpAggregator.getCurrentAggregation(baseRowInds, baseRowVals, true);
     rhs = 0;
-    cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs);
+    cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs, false, true);
     if (mip.mipdata_->domain.infeasible()) break;
 
     lpAggregator.clear();