From 85d77b45d31733a5697606d4f2f7f0abee277dc5 Mon Sep 17 00:00:00 2001 From: Suresh Bolusani Date: Thu, 27 Jul 2023 12:33:00 +0200 Subject: [PATCH 1/3] Bugfix related to sepa_maxruns parameter --- src/scip/solve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scip/solve.c b/src/scip/solve.c index e38d87a908..bc06a23ba1 100644 --- 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); From d99d44cae5650fa9adb59441a7c9c9ea5a5f4b47 Mon Sep 17 00:00:00 2001 From: Suresh Bolusani Date: Thu, 27 Jul 2023 12:48:50 +0200 Subject: [PATCH 2/3] CHANGELOG entry --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 3e82f2ca7c..bf4eef4ad7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -147,6 +147,7 @@ Build system Fixed bugs ---------- +- number of separation rounds will now be correct as per "separating/maxruns" parameter - add safeguard for number of selected cuts Miscellaneous From 47e9965209d7ffbfaeee3b67bfc4bab6e8539850 Mon Sep 17 00:00:00 2001 From: Suresh Bolusani Date: Thu, 27 Jul 2023 13:26:29 +0200 Subject: [PATCH 3/3] Update CHANGELOG entry --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index bf4eef4ad7..6d99397e26 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -147,7 +147,8 @@ Build system Fixed bugs ---------- -- number of separation rounds will now be correct as per "separating/maxruns" parameter +- 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