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

Author: scip-ci

src/scip/benders.c

@@ -2872,7 +2872,6 @@ SCIP_RETCODE SCIPbendersActivate(
          SCIP_CALL( SCIPpqueueInsert(benders->subprobqueue, benders->solvestat[i]) );
       }
 
-
       if( SCIPsetFindEventhdlr(set, NODESOLVED_EVENTHDLR_NAME) == NULL )
       {
          /* adding an eventhandler for updating the lower bound when the root node is solved. */
@@ -6204,7 +6203,7 @@ void SCIPbendersRemoveSubproblems(
 
 /** returns the main auxiliary variable that is used the subproblem objective function. */
 SCIP_VAR* SCIPbenderGetMasterAuxiliaryVar(
-   SCIP_BENDERS*         benders            /**< Benders' decomposition */
+   SCIP_BENDERS*         benders             /**< Benders' decomposition */
    )
 {
    assert(benders != NULL);

src/scip/benderscut_int.c

@@ -115,7 +115,6 @@ SCIP_RETCODE createBenderscutData(
    SCIP_CALL( SCIPallocBlockMemoryArray(scip, &benderscutdata->subprobconstant, benderscutdata->nsubproblems) );
    SCIP_CALL( SCIPallocBlockMemoryArray(scip, &benderscutdata->firstcut, benderscutdata->nsubproblems) );
 
-
    for( i = 0; i < benderscutdata->nsubproblems; i++ )
    {
       benderscutdata->subprobconstant[i] = benderscutdata->cutconstant;

src/scip/benderscut_nogood.c

@@ -84,7 +84,7 @@ static
 void checkSubproblemValidity(
    SCIP_BENDERS*         benders,            /**< the benders' decomposition structure */
    SCIP_BENDERSCUT*      benderscut          /**< the benders' decomposition cut method */
-)
+   )
 {
    SCIP_BENDERSCUTDATA* benderscutdata;
    int nmastervars;

src/scip/branch_relpscost.c

@@ -902,7 +902,6 @@ SCIP_Real cdfProbability(
          return 0.0;
       else
          return zeroprob + (1.0 - zeroprob) * (1.0 - pow(mingain / proposedgain, rate));
-
    }
    else if(distributioncdf == EXPONENTIALDISTRIBUTION)
    {
@@ -930,7 +929,6 @@ SCIP_Real expectedTreeSize(
    int                   distributioncdf     /**< distribution type (PARETODISTRIBUTION, EXPONENTIALDISTRIBUTION, LOGNORMALDISTRIBUTION) */
    )
 {
-
    SCIP_Real ptotal = 0.0;
    SCIP_Real totalimprovedtree = 0.0;
 
@@ -1760,7 +1758,6 @@ SCIP_RETCODE execRelpscost(
 
       for( i = 0; continueStrongBranchingLookahead(scip, i, ninitcands, lookahead, maxlookahead, nbdchgs, nbdconflicts, maxbdchgs, maxnsblpiterations) && continueStrongBranchingTreeSizeEstimation(scip, branchruledata, lookahead, maxlookahead); ++i )
       {
-
          SCIP_Real down;
          SCIP_Real up;
          SCIP_Real downgain;

src/scip/certificate.cpp

@@ -2082,7 +2082,6 @@ SCIP_RETCODE SCIPcertificatePrintMirCut(
    }
    SCIP_CALL( SCIPhashmapInsertLong(certificate->rowdatahash, SCIProwGetRowExact(row), certificate->indexcounter - 1) );
 
-
    SCIP_CALL( SCIPcertificateFreeAggrInfo(set, certificate, lp, aggrinfo, row) );
    SCIP_CALL( SCIPcertificateFreeMirInfo(set, certificate, lp, mirinfo, row) );
 
@@ -3385,7 +3384,7 @@ SCIP_RETCODE SCIPcertificatePrintCutoffConflictingBounds(
       ubindex = SCIPvarGetUbCertificateIndexLocal(var);
    }
    assert( SCIPrationalIsGT(lb, ub) );
-   SCIP_CALL(SCIPrationalCreateBuffer(SCIPbuffer(scip), &lowerbound));
+   SCIP_CALL( SCIPrationalCreateBuffer(SCIPbuffer(scip), &lowerbound) );
 
    SCIPcertificatePrintProofMessage(certificate, "BoundConflict%d ", certificate->indexcounter);
    SCIPcertificatePrintProofMessage(certificate, "G ");

src/scip/certificate.h

@@ -457,8 +457,8 @@ SCIP_RETCODE SCIPcertificatePrintGlobalBound(
 
 /* prints information for constraint to certificate file */
 SCIP_RETCODE SCIPconsPrintCertificateExactLinear(
-   SCIP*                 scip,              /**< SCIP data structure */
-   SCIP_CONS*            cons               /**< constraint */
+   SCIP*                 scip,               /**< SCIP data structure */
+   SCIP_CONS*            cons                /**< constraint */
    );
 
 /** returns the index of the given constraint in the certificate */

src/scip/conflict_dualproofanalysis.c

@@ -313,7 +313,6 @@ SCIP_RETCODE proofsetAddAggrrow(
       proofset->certificateline = (SCIP_Longint)aggrrow->certificateline;
    }
 
-
    return SCIP_OKAY;
 }
 
@@ -993,8 +992,8 @@ SCIP_RETCODE createAndAddProofcons(
       SCIP_RATIONAL** coefs_exact;
       SCIP_VAR** consvars;
 
-      SCIP_CALL(SCIPrationalCreateBuffer(SCIPbuffer(set->scip), &lhs_exact));
-      SCIP_CALL(SCIPrationalCreateBuffer(SCIPbuffer(set->scip), &rhs_exact));
+      SCIP_CALL( SCIPrationalCreateBuffer(SCIPbuffer(set->scip), &lhs_exact) );
+      SCIP_CALL( SCIPrationalCreateBuffer(SCIPbuffer(set->scip), &rhs_exact) );
       SCIPrationalSetNegInfinity(lhs_exact);
       SCIPrationalSetReal(rhs_exact, rhs);
       SCIP_CALL( SCIPrationalCreateBufferArray(SCIPbuffer(set->scip), &coefs_exact, nnz) );

src/scip/conflict_graphanalysis.c

@@ -2523,7 +2523,6 @@ SCIP_RETCODE conflictAddBound(
    SCIP_Real             relaxedbd           /**< relaxed bound */
    )
 {
-
    SCIP_Bool success;
 
    assert(SCIPvarIsActive(var));

src/scip/conflict_resolution.c

@@ -1479,7 +1479,6 @@ SCIP_RETCODE MirReduction(
    SCIP_CALL( SCIPcalcMIR(set->scip, refsol, POSTPROCESS, BOUNDSWITCH, USEVBDS, FALSE, FIXINTEGRALRHS, NULL, NULL,
          MINFRAC, MAXFRAC, 1.0, aggrrow, cutcoefs, &cutrhs, cutinds, &cutnnz, NULL, NULL, &cutislocal, &success) );
 
-
    if( success )
    {
       assert(!cutislocal);
@@ -1745,7 +1744,7 @@ SCIP_RETCODE slackReducingContinuousBdchgQueue(
    if( SCIPpqueueNElems(conflict->continuousbdchgqueue) != 0 )
       SCIPpqueueClear(conflict->continuousbdchgqueue);
 
-   /** For a row of the form ax >= b, we can add all continuous bound changes before inferbdchgidx that reduce the slack
+   /*  For a row of the form ax >= b, we can add all continuous bound changes before inferbdchgidx that reduce the slack
     *  for each continuous variable x_k with coefficient a_k:
     *  - a_k > 0: then add bound changes (if not already present). Uses SCIPvarGetUbchgInfo() to get the latest
     *    bound change used in the slack of row.
@@ -2040,7 +2039,7 @@ SCIP_RETCODE SCIPconflictAddConflictCon(
 
       boundtype = conflictrow->vals[idx] > 0.0 ? SCIP_BOUNDTYPE_LOWER : SCIP_BOUNDTYPE_UPPER;
 
-      /** Since the conflictrow is in the form a*x >= b:
+      /*  Since the conflictrow is in the form a*x >= b:
        *  For integer variables:
        *    coef > 0: The lower bound change is equal to ceil(lhs / coef)
        *    coef < 0: The upper bound change is equal to floor(lhs / coef)
@@ -2181,7 +2180,6 @@ SCIP_Real computeScaleReason(
 
    scale = REALABS( coefconf / coefreas );
    return scale;
-
 }
 
 /** compute the resolved conflict row resolvedrow = row1 + scale * row2 */
@@ -2622,7 +2620,7 @@ SCIP_RETCODE getConflictRow(
       SCIP_CALL( computeSlack(set, vars, conflictrow, currbdchginfo, NULL, NULL) );
    }
 
-   /** The conflict row might not be infeasible.
+   /*  The conflict row might not be infeasible.
     *  This may not be true is if the conflict is found by some non-linear propagation argument:
     *  - by a negated clique in the knapsack constraint handler
     *  - by propagating a ranged row with a gcd argument
@@ -2688,7 +2686,6 @@ SCIP_RETCODE executeResolutionStep(
    if( !(*successresolution) )
       return SCIP_OKAY;
 
-
    SCIP_CALL( computeSlack(set, vars, resolvedconflictrow, currbdchginfo, fixbounds, fixsides) );
 
    /* return if the reduction is off */
@@ -2807,7 +2804,6 @@ SCIP_RETCODE executeResolutionStep(
                                  residx, successresolution) );
 
             SCIP_CALL( computeSlack(set, vars, resolvedconflictrow, currbdchginfo, fixbounds, fixsides) );
-
          }
       }
    }
@@ -2939,7 +2935,6 @@ SCIP_RETCODE addConflictRows(
 
       if( SCIPsetIsLT(set, conflictrowtoadd->coefquotient, set->conf_maxcoefquot) )
       {
-
          SCIP_Bool success;
 
          SCIP_CALL( SCIPconflictAddConflictCon(conflict, blkmem, set, stat, transprob, origprob, tree, reopt,
@@ -3104,14 +3099,14 @@ SCIP_RETCODE conflictAnalyzeResolution(
    SCIP_CALL( SCIPsetAllocBufferArray(set, &fixsides, nvars) );
    SCIP_CALL( SCIPsetAllocBufferArray(set, &fixbounds, nvars) );
 
-   /** set value in fixsides to 0 to indicate that a variable is not fixed
+   /* set value in fixsides to 0 to indicate that a variable is not fixed
     * if a variable is set at an upper bound, then the value is 1
     * if a variable is set at a lower bound, then the value is -1
     */
    for( i = 0; i < nvars; ++i )
       fixsides[i] = 0;
 
-   /** main loop:
+   /* main loop:
     * --------------------------------
     * - we start with the initial conflict row and the first bound change to
     *   resolve
@@ -3222,7 +3217,7 @@ SCIP_RETCODE conflictAnalyzeResolution(
 
          SCIPdebug(printConflictRow(conflictrow, set, vars, RESOLVED_CONFLICT_ROWTYPE));
 
-         /** A positive slack means that the conflict row is not infeasible anymore.
+         /*  A positive slack means that the conflict row is not infeasible anymore.
           *  Unfortunately we cannot guarrante that the slack becomes zero after reducing
           *  the reason (even if we have only binary variables).
           *  Two issues are non-linear propagations, e.g.
@@ -3325,8 +3320,8 @@ SCIP_RETCODE conflictAnalyzeResolution(
 
       nconstoadd = (set->conf_resfuiplevels > 0) ? MIN(set->conf_resfuiplevels, conflict->nconflictrows) : conflict->nconflictrows;
 
-      SCIP_CALL(addConflictRows(conflict, blkmem, set, stat, transprob, origprob, tree, reopt, lp, branchcand, eventqueue,
-            eventfilter, cliquetable, nconstoadd, nconss, nconfvars));
+      SCIP_CALL( addConflictRows(conflict, blkmem, set, stat, transprob, origprob, tree, reopt, lp, branchcand, eventqueue,
+            eventfilter, cliquetable, nconstoadd, nconss, nconfvars) );
    }
 
    freeConflictResources(conflict, blkmem, set, fixbounds, fixsides);

src/scip/cons_cumulative.c

@@ -218,7 +218,6 @@ struct SCIP_ConshdlrData
 
    SCIP_DECL_SOLVECUMULATIVE((*solveCumulative)); /**< method to use a single cumulative condition */
 
-
    /* statistic values which are collected if SCIP_STATISTIC is defined */
 #ifdef SCIP_STATISTIC
    SCIP_Longint          nlbtimetable;       /**< number of times the lower bound was tightened by the time-table propagator */
@@ -310,8 +309,8 @@ int inferInfoToInt(
 /** rounds real to int and maps for large absolute values */
 static
 int boundedConvertRealToInt(
-   SCIP*                 scip,             /**< scip data structure */
-   SCIP_Real             real              /**< double bound to convert */
+   SCIP*                 scip,               /**< scip data structure */
+   SCIP_Real             real                /**< double bound to convert */
    )
 {
    int maxval;
@@ -8500,7 +8499,7 @@ SCIP_RETCODE createCapacityRestriction(
       }
 
       SCIP_CALL( SCIPflushRowExtensions(scip, row) );
-      SCIPdebug( SCIP_CALL(SCIPprintRow(scip, row, NULL)) );
+      SCIPdebug( SCIP_CALL( SCIPprintRow(scip, row, NULL) ) );
 
       if( consdata->demandrowssize == 0 )
       {
@@ -8984,7 +8983,7 @@ SCIP_RETCODE createCapacityRestrictionIntvars(
    }
 
    SCIP_CALL( SCIPflushRowExtensions(scip, row) );
-   SCIPdebug( SCIP_CALL(SCIPprintRow(scip, row, NULL)) );
+   SCIPdebug( SCIP_CALL( SCIPprintRow(scip, row, NULL) ) );
 
    SCIP_CALL( SCIPaddRow(scip, row, TRUE, cutoff) );