Skip to content

Commit 4518321

Browse files
Merge branch 'rename-exact_interleavestrategy' into 'master'
perform forgotten rename of parameter exact_interleavestrategy See merge request integer/scip!3885
2 parents d700648 + 0fcb277 commit 4518321

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/scip/lpexact_bounding.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1885,8 +1885,8 @@ char chooseInitialBoundingMethod(
18851885
* a) at depth levels 4, 8, 16, ..., or
18861886
* b) almost at cutoffbound
18871887
*/
1888-
interleavedepth = set->exact_interleavestrategy >= 2 && SCIPgetDepth(set->scip) > 0 && isPowerOfTwo(SCIPgetDepth(set->scip) - 1);
1889-
interleavecutoff = (set->exact_interleavestrategy == 1 || set->exact_interleavestrategy == 3)
1888+
interleavedepth = set->exact_interleavedbfreq >= 2 && SCIPgetDepth(set->scip) > 0 && isPowerOfTwo(SCIPgetDepth(set->scip) - 1);
1889+
interleavecutoff = (set->exact_interleavedbfreq == 1 || set->exact_interleavedbfreq == 3)
18901890
&& SCIPsetIsGE(set, SCIPlpGetObjval(lpexact->fplp, set, prob), SCIPlpGetCutoffbound(lpexact->fplp))
18911891
&& SCIPlpGetObjval(lpexact->fplp, set, prob) < SCIPlpGetCutoffbound(lpexact->fplp);
18921892
if( (interleavedepth || interleavecutoff) && lpexact->allowexactsolve )

src/scip/set.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@
522522
#define SCIP_DEFAULT_EXACT_IMPROVINGSOLS TRUE /**< should only exact solutions be checked which improve the primal bound? */
523523
#define SCIP_DEFAULT_EXACT_SAFEDBMETHOD 'a' /**< method for computing safe dual bounds
524524
* ('n'eumaier-shcherbina, 'p'roject-and-shift, 'e'xact LP, 'a'utomatic) */
525-
#define SCIP_DEFAULT_EXACT_INTERLEAVESTRATEGY 1 /**< frequency at which safe dual bounding method is interleaved with exact LP
525+
#define SCIP_DEFAULT_EXACT_INTERLEAVEDBFREQ 1 /**< frequency at which safe dual bounding method is interleaved with exact LP
526526
* solve (-1: never, 0: automatic, n > 0: every n-th node) */
527527
#define SCIP_DEFAULT_EXACT_PSDUALCOLSELECTION 1 /**< strategy for dual column selection in project-and-shift to compute interior point
528528
* (0: no sel, 1: active rows of inexact primal LP, 2: active rows of exact primal LP) */
@@ -2835,7 +2835,7 @@ SCIP_RETCODE SCIPsetCreate(
28352835
SCIP_CALL( SCIPsetAddIntParam(*set, messagehdlr, blkmem,
28362836
"exact/interleavedbfreq",
28372837
"strategy to interleave safe dual bounding with exact LP solve (0: never, 1: only close to cutoff bound, 2: only at depth lvl 4,8,16,..., 3: close to cutoff bound OR at depth lvl 4,8,16,...)",
2838-
&(*set)->exact_interleavestrategy, FALSE, SCIP_DEFAULT_EXACT_INTERLEAVESTRATEGY, 0, 3, NULL, NULL) );
2838+
&(*set)->exact_interleavedbfreq, FALSE, SCIP_DEFAULT_EXACT_INTERLEAVEDBFREQ, 0, 3, NULL, NULL) );
28392839
SCIP_CALL( SCIPsetAddBoolParam(*set, messagehdlr, blkmem,
28402840
"exact/lpinfo",
28412841
"should the exact LP solver display status messages?",
@@ -2875,7 +2875,7 @@ SCIP_RETCODE SCIPsetCreate(
28752875
(*set)->exact_improvingsols = SCIP_DEFAULT_EXACT_IMPROVINGSOLS;
28762876
(*set)->exact_safedbmethod = SCIP_DEFAULT_EXACT_SAFEDBMETHOD;
28772877
(*set)->exact_psdualcolselection = SCIP_DEFAULT_EXACT_PSDUALCOLSELECTION;
2878-
(*set)->exact_interleavestrategy = SCIP_DEFAULT_EXACT_INTERLEAVESTRATEGY;
2878+
(*set)->exact_interleavedbfreq = SCIP_DEFAULT_EXACT_INTERLEAVEDBFREQ;
28792879
(*set)->exact_lpinfo = SCIP_DEFAULT_EXACT_LPINFO;
28802880
(*set)->exact_allownegslack = SCIP_DEFAULT_EXACT_ALLOWNEGSLACK;
28812881
(*set)->exact_cutmaxdenom = SCIP_DEFAULT_CUTMAXDENOM;

src/scip/struct_set.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ struct SCIP_Set
633633
/* exact SCIP settings */
634634
SCIP_Bool exact_enable; /**< should the problem be solved exactly (without numerical tolerances)? */
635635
SCIP_Bool exact_improvingsols; /**< should only exact solutions be checked which improve the primal bound? */
636-
int exact_interleavestrategy; /**< strategy to interleave safe dual bounding with exact LP
636+
int exact_interleavedbfreq; /**< strategy to interleave safe dual bounding with exact LP
637637
* solve (0: never, 1: only close to cutoff bound, 2: only at depth lvl 4,8,16,...,
638638
* 3: close to cutoff bound OR at depth lvl 4,8,16,...) */
639639
char exact_safedbmethod; /**< method for computing safe dual bounds

0 commit comments

Comments
 (0)