Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

src/scip/lpexact_bounding.c

@@ -189,7 +189,7 @@ SCIP_RETCODE projectShiftChooseDualSubmatrix(
    }
    else if( set->exact_psdualcolselection == (int) PS_DUALCOSTSEL_ACTIVE_EXLP )
    {
-      /* determone which dual variables to include in the problem (in this case we choose dual variables whose primal
+      /* determine which dual variables to include in the problem (in this case we choose dual variables whose primal
        * constraints are active at the solution of the exact LP at the root node)
        */
 
@@ -1860,9 +1860,10 @@ char chooseInitialBoundingMethod(
    assert(lpexact != NULL);
    assert(set != NULL);
 
+   /* at the root node always call exact LP solve if allowed, i.e., after separation */
    if( set->scip->stat->nnodes == 1 && lpexact->allowexactsolve )
       dualboundmethod = 'e';
-   /* first, check if we need to solve exactly */
+   /* check for other reasons to solve exactly */
    else if( lpexact->forceexactsolve || SCIPlpGetSolstat(lpexact->fplp) == SCIP_LPSOLSTAT_UNBOUNDEDRAY )
       dualboundmethod = 'e';
    /* if the LP was solved to optimality and there are no fractional variables we solve exactly to generate a feasible
@@ -1882,11 +1883,11 @@ char chooseInitialBoundingMethod(
    else
    {
       /* decide whether we want to interleave with exact LP call given freq: we do this if we are
-       * a) at depth levels 4, 8, 16, ..., or
+       * a) at depth levels 2, 4, 8, 16, ..., or
        * b) almost at cutoffbound
        */
-      interleavedepth = set->exact_interleavedbfreq >= 2 && SCIPgetDepth(set->scip) > 0 && isPowerOfTwo(SCIPgetDepth(set->scip) - 1);
-      interleavecutoff = (set->exact_interleavedbfreq == 1 || set->exact_interleavedbfreq == 3)
+      interleavedepth = set->exact_interleavedbstrat >= 2 && SCIPgetDepth(set->scip) > 1 && isPowerOfTwo(SCIPgetDepth(set->scip));
+      interleavecutoff = (set->exact_interleavedbstrat == 1 || set->exact_interleavedbstrat == 3)
          && SCIPsetIsGE(set, SCIPlpGetObjval(lpexact->fplp, set, prob), SCIPlpGetCutoffbound(lpexact->fplp))
          && SCIPlpGetObjval(lpexact->fplp, set, prob) < SCIPlpGetCutoffbound(lpexact->fplp);
       if( (interleavedepth || interleavecutoff) && lpexact->allowexactsolve )

src/scip/primal.c

@@ -2445,7 +2445,7 @@ SCIP_RETCODE SCIPprimalTrySolFreeExact(
    return SCIP_OKAY;
 }
 
-/** adds iexact primal solution to solution storage by copying it and frees the solution afterwards */
+/** adds exact primal solution to solution storage by copying it and frees the solution afterwards */
 SCIP_RETCODE SCIPprimalAddSolFreeExact(
    SCIP_PRIMAL*          primal,             /**< primal data */
    BMS_BLKMEM*           blkmem,             /**< block memory */

src/scip/primal.h

@@ -432,7 +432,7 @@ SCIP_RETCODE SCIPprimalTrySolFreeExact(
    SCIP_Bool*            stored              /**< stores whether given solution was good enough to keep */
    );
 
-/** adds iexact primal solution to solution storage by copying it and frees the solution afterwards */
+/** adds exact primal solution to solution storage by copying it and frees the solution afterwards */
 SCIP_RETCODE SCIPprimalAddSolFreeExact(
     SCIP_PRIMAL*          primal,             /**< primal data */
     BMS_BLKMEM*           blkmem,             /**< block memory */

src/scip/set.c

@@ -535,8 +535,9 @@
 #define SCIP_DEFAULT_EXACT_IMPROVINGSOLS   TRUE /**< should only exact solutions be checked which improve the primal bound? */
 #define SCIP_DEFAULT_EXACT_SAFEDBMETHOD     'a' /**< method for computing safe dual bounds
                                                  *   ('n'eumaier-shcherbina, 'p'roject-and-shift, 'e'xact LP, 'a'utomatic) */
-#define SCIP_DEFAULT_EXACT_INTERLEAVEDBFREQ   1 /**< frequency at which safe dual bounding method is interleaved with exact LP
-                                                 *   solve (-1: never, 0: automatic, n > 0: every n-th node) */
+#define SCIP_DEFAULT_EXACT_INTERLEAVEDBSTRAT   1 /**< strategy to interleave safe dual bounding with exact LP solve (0: never,
+                                                 *   1: only close to cutoff bound, 2: only at depth lvl 2,4,8,16,...,
+                                                 *   3: close to cutoff bound OR at depth lvl 2,4,8,16,...) */
 #define SCIP_DEFAULT_EXACT_PSDUALCOLSELECTION 1 /**< strategy for dual column selection in project-and-shift to compute interior point
                                                  *   (0: no sel, 1: active rows of inexact primal LP, 2: active rows of exact primal LP) */
 #define SCIP_DEFAULT_EXACT_LPINFO         FALSE /**< should the exact LP solver display status messages? */
@@ -2886,9 +2887,9 @@ SCIP_RETCODE SCIPsetCreate(
          "strategy for dual column selection in project-and-shift to compute interior point (0: no sel, 1: active rows of inexact primal LP, 2: active rows of exact primal LP)",
          &(*set)->exact_psdualcolselection, TRUE, SCIP_DEFAULT_EXACT_PSDUALCOLSELECTION, 0, 2, NULL, NULL) );
    SCIP_CALL( SCIPsetAddIntParam(*set, messagehdlr, blkmem,
-         "exact/interleavedbfreq",
-         "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,...)",
-         &(*set)->exact_interleavedbfreq, FALSE, SCIP_DEFAULT_EXACT_INTERLEAVEDBFREQ, 0, 3, NULL, NULL) );
+         "exact/interleavedbstrat",
+         "strategy to interleave safe dual bounding with exact LP solve (0: never, 1: only close to cutoff bound, 2: only at depth lvl 2,4,8,16,..., 3: close to cutoff bound OR at depth lvl 2,4,8,16,...)",
+         &(*set)->exact_interleavedbstrat, FALSE, SCIP_DEFAULT_EXACT_INTERLEAVEDBSTRAT, 0, 3, NULL, NULL) );
    SCIP_CALL( SCIPsetAddBoolParam(*set, messagehdlr, blkmem,
          "exact/lpinfo",
          "should the exact LP solver display status messages?",
@@ -2928,7 +2929,7 @@ SCIP_RETCODE SCIPsetCreate(
    (*set)->exact_improvingsols = SCIP_DEFAULT_EXACT_IMPROVINGSOLS;
    (*set)->exact_safedbmethod = SCIP_DEFAULT_EXACT_SAFEDBMETHOD;
    (*set)->exact_psdualcolselection = SCIP_DEFAULT_EXACT_PSDUALCOLSELECTION;
-   (*set)->exact_interleavedbfreq = SCIP_DEFAULT_EXACT_INTERLEAVEDBFREQ;
+   (*set)->exact_interleavedbstrat = SCIP_DEFAULT_EXACT_INTERLEAVEDBSTRAT;
    (*set)->exact_lpinfo = SCIP_DEFAULT_EXACT_LPINFO;
    (*set)->exact_allownegslack = SCIP_DEFAULT_EXACT_ALLOWNEGSLACK;
    (*set)->exact_cutmaxdenom = SCIP_DEFAULT_CUTMAXDENOM;

src/scip/struct_set.h

@@ -645,9 +645,9 @@ struct SCIP_Set
    /* exact SCIP settings */
    SCIP_Bool             exact_enable;       /**< should the problem be solved exactly (without numerical tolerances)? */
    SCIP_Bool             exact_improvingsols; /**< should only exact solutions be checked which improve the primal bound? */
-   int                   exact_interleavedbfreq; /**< 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,...) */
+   int                   exact_interleavedbstrat; /**< strategy to interleave safe dual bounding with exact LP
+                                              *   solve (0: never, 1: only close to cutoff bound, 2: only at depth lvl 2,4,8,16,...,
+                                              *   3: close to cutoff bound OR at depth lvl 2,4,8,16,...) */
    char                  exact_safedbmethod; /**< method for computing safe dual bounds
                                               *   ('n'eumaier-shcherbina, 'p'roject-and-shift, 'e'xact LP, 'a'utomatic) */
    int                   exact_psdualcolselection; /**< strategy for dual column selection in project-and-shift to compute interior point

src/scip/struct_stat.h

@@ -226,13 +226,13 @@ struct SCIP_Stat
    SCIP_Longint          nstrongbranchs;     /**< number of strong branching calls */
    SCIP_Longint          nrootstrongbranchs; /**< number of strong branching calls at the root node */
    SCIP_Longint          nconflictlps;       /**< number of LPs solved during conflict analysis */
-   SCIP_Longint          nexlpinf;           /**< number of LPs proved infeasible */
-   SCIP_Longint          nfailexlpinf;       /**< number of LPs failed to prove infeasible */
-   SCIP_Longint          nexlp;              /**< number of LPs proved feasible */
-   SCIP_Longint          nexlpinter;         /**< number of LPs proved feasible */
-   SCIP_Longint          nexlpintfeas;       /**< number of LPs proved feasible */
-   SCIP_Longint          nexlpboundexc;      /**< number of LPs proved feasible */
-   SCIP_Longint          nfailexlp;          /**< number of LPs failed to prove feasible */
+   SCIP_Longint          nexlpinf;           /**< number of exact LPs solved to prove infeasibility */
+   SCIP_Longint          nfailexlpinf;       /**< number of exact LPs failed to prove infeasibility */
+   SCIP_Longint          nexlp;              /**< number of exact LPs solved for safe dual bounding */
+   SCIP_Longint          nexlpinter;         /**< number of exact LPs solved because of depth interleaving */
+   SCIP_Longint          nexlpintfeas;       /**< number of exact LPs solved for integrality polishing */
+   SCIP_Longint          nexlpboundexc;      /**< number of exact LPs solved because close to cutoff bound */
+   SCIP_Longint          nfailexlp;          /**< number of exact LPs failed to compute a safe dual bound */
    SCIP_Longint          nboundshift;        /**< number of boundshift calls for feasible lp*/
    SCIP_Longint          nfailboundshift;    /**< number of failed boundshift calls for feasible lp */
    SCIP_Longint          nboundshiftinf;     /**< number of boundshift calls for infeasible lp */