Merge remote-tracking branch 'origin/v9-minor'

Author: scip-ci

CHANGELOG

@@ -144,6 +144,7 @@ Fixed bugs
 - fixed NULL pointer dereference in SCIPtpiGetNumThreads() of TinyCThread interface if called before SCIPtpiInit(); now returns 0 in this case
 - calling SCIPsolveConcurrent() when SCIP was compiled without a TPI now results in a plugin-not-found error
 - fixed LPI status functions of lpi_cpx if the barrier is called
+- check cuts for redundancy after scaling in cutTightenCoefs() and cutTightenCoefsQuad() of cuts.c
 
 Performance improvements
 ------------------------

src/scip/cuts.c

@@ -907,7 +907,6 @@ SCIP_RETCODE cutTightenCoefsQuad(
       {
          /* if successful, apply the scaling */
          intscalar *= equiscale;
-
          SCIPquadprecProdQD(*cutrhs, *cutrhs, intscalar);
 
          for( i = 0; i < *cutnnz; )
@@ -980,18 +979,9 @@ SCIP_RETCODE cutTightenCoefsQuad(
             }
          }
 
-         maxact = QUAD_TO_DBL(maxacttmp);
-
-         assert(EPSISINT(maxact, 1e-4));
-         maxact = SCIPround(scip, maxact);
-         QUAD_ASSIGN(maxacttmp, maxact);
-
-         /* check again for redundancy */
-         if( SCIPisFeasLE(scip, maxact, QUAD_TO_DBL(*cutrhs)) )
-         {
-            *redundant = TRUE;
-            return SCIP_OKAY;
-         }
+         assert(EPSISINT(QUAD_TO_DBL(maxacttmp), 1e-4));
+         SCIPquadprecSumQD(maxacttmp, maxacttmp, 0.5);
+         SCIPquadprecFloorQ(maxacttmp, maxacttmp);
       }
       else
       {
@@ -1000,7 +990,6 @@ SCIP_RETCODE cutTightenCoefsQuad(
 
          /* perform the scaling */
          SCIPquadprecProdQD(maxacttmp, maxacttmp, equiscale);
-
          SCIPquadprecProdQD(*cutrhs, *cutrhs, equiscale);
          maxabsintval *= equiscale;
 
@@ -1028,8 +1017,6 @@ SCIP_RETCODE cutTightenCoefsQuad(
 
       /* perform the scaling */
       SCIPquadprecProdQD(maxacttmp, maxacttmp, scale);
-      maxact = QUAD_TO_DBL(maxacttmp);
-
       SCIPquadprecProdQD(*cutrhs, *cutrhs, scale);
       maxabsintval *= scale;
 
@@ -1043,6 +1030,15 @@ SCIP_RETCODE cutTightenCoefsQuad(
       }
    }
 
+   maxact = QUAD_TO_DBL(maxacttmp);
+
+   /* check again for redundancy after scaling */
+   if( SCIPisFeasLE(scip, maxact, QUAD_TO_DBL(*cutrhs)) )
+   {
+      *redundant = TRUE;
+      return SCIP_OKAY;
+   }
+
    /* no coefficient tightening can be performed since the precondition doesn't hold for any of the variables */
    if( SCIPisGT(scip, maxact - maxabsintval, QUAD_TO_DBL(*cutrhs)) )
       return SCIP_OKAY;
@@ -1286,7 +1282,6 @@ SCIP_RETCODE cutTightenCoefs(
       {
          /* if successful, apply the scaling */
          intscalar *= equiscale;
-
          SCIPquadprecProdQD(*cutrhs, *cutrhs, intscalar);
 
          for( i = 0; i < *cutnnz; )
@@ -1356,18 +1351,9 @@ SCIP_RETCODE cutTightenCoefs(
             }
          }
 
-         maxact = QUAD_TO_DBL(maxacttmp);
-
-         assert(EPSISINT(maxact, 1e-4));
-         maxact = SCIPround(scip, maxact);
-         QUAD_ASSIGN(maxacttmp, maxact);
-
-         /* check again for redundancy */
-         if( SCIPisFeasLE(scip, maxact, QUAD_TO_DBL(*cutrhs)) )
-         {
-            *redundant = TRUE;
-            return SCIP_OKAY;
-         }
+         assert(EPSISINT(QUAD_TO_DBL(maxacttmp), 1e-4));
+         SCIPquadprecSumQD(maxacttmp, maxacttmp, 0.5);
+         SCIPquadprecFloorQ(maxacttmp, maxacttmp);
       }
       else
       {
@@ -1376,7 +1362,6 @@ SCIP_RETCODE cutTightenCoefs(
 
          /* perform the scaling */
          SCIPquadprecProdQD(maxacttmp, maxacttmp, equiscale);
-
          SCIPquadprecProdQD(*cutrhs, *cutrhs, equiscale);
          maxabsintval *= equiscale;
 
@@ -1398,15 +1383,22 @@ SCIP_RETCODE cutTightenCoefs(
 
       /* perform the scaling */
       SCIPquadprecProdQD(maxacttmp, maxacttmp, scale);
-      maxact = QUAD_TO_DBL(maxacttmp);
-
       SCIPquadprecProdQD(*cutrhs, *cutrhs, scale);
       maxabsintval *= scale;
 
       for( i = 0; i < *cutnnz; ++i )
          cutcoefs[cutinds[i]] *= scale;
    }
 
+   maxact = QUAD_TO_DBL(maxacttmp);
+
+   /* check again for redundancy after scaling */
+   if( SCIPisFeasLE(scip, maxact, QUAD_TO_DBL(*cutrhs)) )
+   {
+      *redundant = TRUE;
+      return SCIP_OKAY;
+   }
+
    /* no coefficient tightening can be performed since the precondition doesn't hold for any of the variables */
    if( SCIPisGT(scip, maxact - maxabsintval, QUAD_TO_DBL(*cutrhs)) )
       return SCIP_OKAY;