allow more checking for long cuts

coin-or · Dec 16, 2023 · 49a131d · 49a131d
1 parent 745abaa
commit 49a131d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/src/CglGomory/CglGomory.cpp b/src/CglGomory/CglGomory.cpp
@@ -873,6 +873,9 @@ CglGomory::generateCuts(
     printf("Gomory limit changed from %d to %d, inTree %c, pass %d, r %d,c %d,e %d\n",
 	   saveLimit,limit,info.inTree ? 'Y' : 'N',info.pass,
 	   numberRows,numberColumns,numberElements);
+#endif
+#if CBC_CHECK_CUT_LENGTH
+  limit = CoinMin(limit,CBC_CHECK_CUT_LENGTH*numberRows);
 #endif
   int nCandidates=0;
   for (iColumn=0;iColumn<numberColumns;iColumn++) {
@@ -1598,6 +1601,9 @@ CglGomory::generateCuts(
 	    bounds[1]=rhs;
 	    if (number>50&&numberNonInteger)
 	      bounds[1] = rhs+tolerance6+1.0e-8*fabs(rhs); // weaken
+#ifndef GOMORY_RELAX_NUMBER
+#define GOMORY_RELAX_NUMBER 5
+#endif
 #if GOMORY_RELAX_NUMBER
 	    else if (number>GOMORY_RELAX_NUMBER&&numberNonInteger>1) 
 	      bounds[1] = rhs+tolerance6+1.0e-8*fabs(rhs); // weaken

diff --git a/src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.cpp b/src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.cpp
@@ -855,6 +855,14 @@ CglMixedIntegerRounding2::generateMirCuts(
 #endif
 
 	// if a cut was found, insert it into cs
+#if CBC_CHECK_CUT_LENGTH
+	{
+	  const CoinPackedVector & row = cMirCut.row();
+	  int n=row.getNumElements();
+	  if (n>CBC_CHECK_CUT_LENGTH*numRows_)
+	    hasCut = false;
+	}
+#endif
 	if (hasCut)  {
 	  // look at cut to see if unstable
 	  const CoinPackedVector & row = cMirCut.row();

diff --git a/src/CglPreProcess/CglPreProcess.cpp b/src/CglPreProcess/CglPreProcess.cpp
@@ -29,6 +29,7 @@
 #endif
 #include "CglProbing.hpp"
 #include "CglDuplicateRow.hpp"
+#include "CoinPresolveDupcol.hpp"
 #include "CglClique.hpp"
 //#define PRINT_DEBUG 1
 //#define COIN_DEVELOP 1

diff --git a/src/CglProbing/CglProbing.cpp b/src/CglProbing/CglProbing.cpp
@@ -12,6 +12,9 @@
 //#define PRINT_DEBUG
 //#define CGL_DEBUG 1
 //#undef NDEBUG
+#ifndef FIXED_BOTH_WAYS
+#define FIXED_BOTH_WAYS 1
+#endif
 #include "CoinPragma.hpp"
 #include "CoinHelperFunctions.hpp"
 #include "CoinPackedVector.hpp"

diff --git a/src/CglRedSplit2/CglRedSplit2.cpp b/src/CglRedSplit2/CglRedSplit2.cpp
@@ -2092,7 +2092,9 @@ int CglRedSplit2::generateCuts(OsiCuts* cs, int maxNumCuts, int* lambda)
 		  }
 		  // now, add cut to the collection if needed
 		  if (cs != NULL){
-		    if (card_row<300) {
+#if CBC_CHECK_CUT_LENGTH
+		    if (card_row<CBC_CHECK_CUT_LENGTH*nrow) {
+#endif
 		      OsiRowCut rc;
 		      rc.setRow(card_row, rowind, rowelem);
 		      rc.setLb(-param.getINFINIT());
@@ -2104,7 +2106,9 @@ int CglRedSplit2::generateCuts(OsiCuts* cs, int maxNumCuts, int* lambda)
 		      // relax the constraint slightly
 		      buffcs->insertIfNotDuplicate(rc, CoinAbsFltEq(param.getEPS()));
 		      numCuts = buffcs->sizeRowCuts() - initNumCuts;
+#if CBC_CHECK_CUT_LENGTH
 		    }
+#endif
 		  }
 		  else{
 		    numCuts++;