|
522 | 522 | #define SCIP_DEFAULT_EXACT_IMPROVINGSOLS TRUE /**< should only exact solutions be checked which improve the primal bound? */
|
523 | 523 | #define SCIP_DEFAULT_EXACT_SAFEDBMETHOD 'a' /**< method for computing safe dual bounds
|
524 | 524 | * ('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 |
526 | 526 | * solve (-1: never, 0: automatic, n > 0: every n-th node) */
|
527 | 527 | #define SCIP_DEFAULT_EXACT_PSDUALCOLSELECTION 1 /**< strategy for dual column selection in project-and-shift to compute interior point
|
528 | 528 | * (0: no sel, 1: active rows of inexact primal LP, 2: active rows of exact primal LP) */
|
@@ -2835,7 +2835,7 @@ SCIP_RETCODE SCIPsetCreate(
|
2835 | 2835 | SCIP_CALL( SCIPsetAddIntParam(*set, messagehdlr, blkmem,
|
2836 | 2836 | "exact/interleavedbfreq",
|
2837 | 2837 | "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) ); |
2839 | 2839 | SCIP_CALL( SCIPsetAddBoolParam(*set, messagehdlr, blkmem,
|
2840 | 2840 | "exact/lpinfo",
|
2841 | 2841 | "should the exact LP solver display status messages?",
|
@@ -2875,7 +2875,7 @@ SCIP_RETCODE SCIPsetCreate(
|
2875 | 2875 | (*set)->exact_improvingsols = SCIP_DEFAULT_EXACT_IMPROVINGSOLS;
|
2876 | 2876 | (*set)->exact_safedbmethod = SCIP_DEFAULT_EXACT_SAFEDBMETHOD;
|
2877 | 2877 | (*set)->exact_psdualcolselection = SCIP_DEFAULT_EXACT_PSDUALCOLSELECTION;
|
2878 |
| - (*set)->exact_interleavestrategy = SCIP_DEFAULT_EXACT_INTERLEAVESTRATEGY; |
| 2878 | + (*set)->exact_interleavedbfreq = SCIP_DEFAULT_EXACT_INTERLEAVEDBFREQ; |
2879 | 2879 | (*set)->exact_lpinfo = SCIP_DEFAULT_EXACT_LPINFO;
|
2880 | 2880 | (*set)->exact_allownegslack = SCIP_DEFAULT_EXACT_ALLOWNEGSLACK;
|
2881 | 2881 | (*set)->exact_cutmaxdenom = SCIP_DEFAULT_CUTMAXDENOM;
|
|
0 commit comments