Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v80-bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
scip-ci committed Aug 25, 2023
2 parents c1df9ea + 82835b0 commit 8672ec5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ Fixed bugs
- globalize constraint changes before bound changes during the effective root shift in treeSwitchPath() to correctly update variable locks by avoiding global bounds with outstanding bound change events when deleting constraints
- fixed error when attempting to copy SCIP with activated pricers
- remove integrality check for implicit integral variables in cons_integral.c
- avoid invalid strong Chvatal-Gomory cuts by ceiling with tolerance in the calculation of parameter k

@section RN804 SCIP 8.0.4
*************************
Expand Down
7 changes: 4 additions & 3 deletions src/scip/cuts.c
Original file line number Diff line number Diff line change
Expand Up @@ -8696,7 +8696,7 @@ SCIP_RETCODE cutsRoundStrongCG(
SCIPquadprecProdQD(cutaj, cutaj, k);
SCIPquadprecProdQQ(cutaj, cutaj, onedivoneminusf0);
pj = SCIPceil(scip, QUAD_TO_DBL(cutaj));
assert(pj >= 0); /* should be >= 1, but due to rounding bias can be 0 if fj almost equal to f0 */
assert(pj >= 0); /* should be >= 1, but due to rounding bias can be 0 if fj is almost equal to f0 */
assert(pj <= k);
SCIPquadprecDivDD(cutaj, pj, k + 1.0);
SCIPquadprecSumQQ(cutaj, cutaj, downaj);
Expand Down Expand Up @@ -8891,7 +8891,7 @@ SCIP_RETCODE cutsSubstituteStrongCG(
SCIPquadprecProdQQ(cutar, cutar, onedivoneminusf0);
SCIPquadprecProdQD(cutar, cutar, k);
pr = SCIPceil(scip, QUAD_TO_DBL(cutar));
assert(pr >= 0); /* should be >= 1, but due to rounding bias can be 0 if fr almost equal to f0 */
assert(pr >= 0); /* should be >= 1, but due to rounding bias can be 0 if fr is almost equal to f0 */
assert(pr <= k);
SCIPquadprecDivDD(cutar, pr, k + 1.0);
SCIPquadprecSumQD(cutar, cutar, downar);
Expand Down Expand Up @@ -9126,7 +9126,8 @@ SCIP_RETCODE SCIPcalcStrongCG(
SCIPquadprecSumDD(f0, QUAD_HI(f0), QUAD_LO(f0));

SCIPquadprecDivDQ(tmp, 1.0, f0);
k = SCIPround(scip, ceil(QUAD_TO_DBL(tmp)) - 1.0);
SCIPquadprecSumQD(tmp, tmp, -1.0);
k = SCIPceil(scip, QUAD_TO_DBL(tmp));

QUAD_ASSIGN_Q(rhs, downrhs);

Expand Down

0 comments on commit 8672ec5

Please sign in to comment.