Merge branch 'sb/sepa_maxruns_bugfix' into 'master'

Bugfix related to sepa_maxruns parameter See merge request integer/scip!3135
scipopt · Jul 27, 2023 · 0dac105 · 0dac105
2 parents 8b2e667 + 47e9965
commit 0dac105
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -147,6 +147,8 @@ Build system
 Fixed bugs
 ----------
 
+- Number of runs in which separation is enabled will now be correct as per "separating/maxruns" parameter. Earlier,
+  separation was enabled for "maxruns + 1" number of runs, i.e., separation was enabled even when "maxruns = 0" was set.
 - add safeguard for number of selected cuts
 
 Miscellaneous

diff --git a/src/scip/solve.c b/src/scip/solve.c
@@ -2337,7 +2337,7 @@ SCIP_RETCODE priceAndCutLoop(
    assert(primal->cutoffbound > glblowerbound);
    bounddist = (loclowerbound - glblowerbound)/(primal->cutoffbound - glblowerbound);
    allowlocal = SCIPsetIsLE(set, bounddist, set->sepa_maxlocalbounddist);
-   separate = (set->sepa_maxruns == -1 || stat->nruns <= set->sepa_maxruns);
+   separate = (set->sepa_maxruns == -1 || stat->nruns < set->sepa_maxruns);
 
    /* get maximal number of separation rounds */
    maxseparounds = (root ? set->sepa_maxroundsroot : set->sepa_maxrounds);