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

Author: scip-ci

CHANGELOG

@@ -398,6 +398,9 @@ Fixed bugs
 - skip attempting to free transformed problem if SCIPtransformProb() failed with an error in SCIPpresolve(), since freeing
   the transformed problem is likely to fail as well
 - fixed memory leak in primal heuristic scheduler when there is a restart
+- fixed stopping when there is a candidate with a change in the LP bound for both children in strong branching of branch_fullstrong
+- fixed detection of sinks in varbound detection from cumulative constraints
+- fixed memory allocation when adding strong SBCs for enclosing orbit of symmetric subgroups (disabled by default)
 
 Build system
 ------------
@@ -406,6 +409,8 @@ Build system
 
 ### Makefile
 
+- added experimental target to run cppcheck
+
 Miscellaneous
 -------------
 

INSTALL.md

@@ -592,6 +592,7 @@ The SCIP makefile supports several targets (used via `make ... "target"`):
 | `depend` | Updates dependencies files. This is only needed if you add checks for preprocessor-defines `WITH_*` in source files. |
 | `check`  | or `test`. Runs the check script.                                         |
 | `lint`   | Statically checks the code via flexelint. The call produces the file `lint.out` which contains all the detected warnings. |
+| `cppcheck` | Statically checks the code via cppcheck. The call produces the file `cppcheck.log` which contains the cppcheck output. |
 | `tags`   | Generates tags which can be used in the editor **emacs** and **xemacs**. |
 
 The SCIP makefiles are structured as follows.

Makefile

@@ -417,7 +417,6 @@ SYMOBJFILES	=	$(addprefix $(LIBOBJDIR)/,$(SYMOBJ))
 SYMSRC  	=	$(addprefix $(SRCDIR)/,$(SYMOBJ:.o=.c))
 LINTSYMSRC	=       $(addprefix $(SRCDIR)/,$(SYMOBJ:.o=.c))
 ifeq ($(NAUTYEXTERNAL),false)
-FLAGS		+=	-I$(SRCDIR)/nauty/src -I$(SRCDIR)/nauty/include
 LIBOBJSUBDIRS	+=	$(LIBOBJDIR)/nauty
 NAUTYOBJ	=	nauty/nauty.o
 NAUTYOBJ	+=      nauty/nautil.o
@@ -448,7 +447,6 @@ SYMOBJFILES	=	$(addprefix $(LIBOBJDIR)/,$(SYMOBJ))
 SYMSRC  	=	$(addprefix $(SRCDIR)/,$(SYMOBJ:.o=.cpp))
 LINTSYMSRC	=       $(addprefix $(SRCDIR)/,$(SYMOBJ:.o=.cpp))
 ifeq ($(NAUTYEXTERNAL),false)
-FLAGS		+=	-I$(SRCDIR)/nauty/src -I$(SRCDIR)/nauty/include
 LIBOBJSUBDIRS	+=	$(LIBOBJDIR)/nauty
 NAUTYOBJ	=	nauty/nauty.o
 NAUTYOBJ	+=      nauty/nautil.o
@@ -1270,6 +1268,21 @@ else
 		$(SHELL) -c '$(SPLINT) -I$(SRCDIR) -I/usr/include/linux $(FLAGS) $(SPLINTFLAGS) $(filter %.c %.h,$(FILES)) >> splint.out;'
 endif
 
+CPPCHECKARGS := $(filter -I%,$(FLAGS))
+CPPCHECKARGS += -j8
+CPPCHECKARGS += --std=c99 --std=c++14
+CPPCHECKARGS += --suppressions-list=suppressions.cppcheck --inline-suppr
+CPPCHECKARGS += --enable=all --force --inconclusive
+CPPCHECKARGS += --error-exitcode=5
+.PHONY: cppcheck
+cppcheck: $(SCIPLIBBASESRC) $(OBJSCIPLIBSRC) $(LPILIBSRC) $(TPILIBSRC) $(MAINSRC) $(SYMSRC) $(SCIPCONFIGHFILE) $(SCIPEXPORTHFILE) $(SCIPBUILDFLAGSFILE) githash
+		-rm -f cppcheck.log
+ifeq ($(FILES),)
+		cppcheck $(CPPCHECKARGS) $^ 2>&1 | tee cppcheck.log
+else
+		cppcheck $(CPPCHECKARGS) $(FILES) 2>&1 | tee cppcheck.log
+endif
+
 .PHONY: doc
 doc:
 		cd doc; $(SHELL) builddoc.sh;
@@ -2004,6 +2017,7 @@ help:
 		@echo "  - lint: Run lint on all SCIP files. (Needs flexelint.)"
 		@echo "  - pclint: Run pclint on all SCIP files. (Needs pclint.)"
 		@echo "  - splint: Run splint on all C SCIP files. (Needs splint.)"
+		@echo "  - cppcheck: Run cppcheck on SCIP source files. (Needs cppcheck.)"
 		@echo "  - clean: Removes all object files."
 		@echo "  - cleanlibs: Remove all SCIP libraries."
 		@echo "  - tags: Creates TAGS file that can be used in (x)emacs."

src/blockmemshell/memory.c

@@ -1524,10 +1524,11 @@ void BMSclearChunkMemory_call(
    int                   line                /**< line number in source file of the function call */
    )
 {
-   debugMessage("clearing chunk memory %p [elemsize: %d]\n", (void*)chkmem, chkmem->elemsize);
-
    if( chkmem != NULL )
+   {
+      debugMessage("clearing chunk memory %p [elemsize: %d]\n", (void*)chkmem, chkmem->elemsize);
       clearChkmem(chkmem, NULL);
+   }
    else
    {
       printErrorHeader(filename, line);
@@ -1544,10 +1545,11 @@ void BMSdestroyChunkMemory_call(
 {
    assert(chkmem != NULL);
 
-   debugMessage("destroying chunk memory %p [elemsize: %d]\n", (void*)*chkmem, (*chkmem)->elemsize);
-
    if( *chkmem != NULL )
+   {
+      debugMessage("destroying chunk memory %p [elemsize: %d]\n", (void*)*chkmem, (*chkmem)->elemsize);
       destroyChkmem(chkmem, NULL);
+   }
    else
    {
       printErrorHeader(filename, line);
@@ -2442,7 +2444,7 @@ void BMSdisplayBlockMemory_call(
       totalnelems > 0 ? 100.0 * (double) (totalneagerelems + totalnlazyelems) / (double) (totalnelems) : 0.0,
       (double)allocedmem/(1024.0*1024.0));
 #endif
-   printInfo("%d blocks (%d unused), %" LONGINT_FORMAT " bytes allocated, %" LONGINT_FORMAT " bytes free",
+   printInfo("%d blocks (%d unused), %" LONGINT_FORMAT " bytes allocated, %" LONGINT_FORMAT " bytes free",   /* cppcheck-suppress syntaxError */
       nblocks + nunusedblocks, nunusedblocks, allocedmem, freemem);
    if( allocedmem > 0 )
       printInfo(" (%.1f%%)", 100.0 * (double) freemem / (double) allocedmem);
@@ -2696,7 +2698,6 @@ void* BMSallocBufferMemory_work(
    int                   line                /**< line number in source file of the function call */
    )
 {
-   /* cppcheck-suppress unassignedVariable */
    void* ptr;
 #ifndef SCIP_NOBUFFERMEM
    size_t bufnum;

src/blockmemshell/memory.h

@@ -878,7 +878,7 @@ size_t BMSgetNUsedBufferMemory(
 /** returns the number of allocated bytes in the buffer memory */
 SCIP_EXPORT
 long long BMSgetBufferMemoryUsed(
-   const BMS_BUFMEM*     bufmem              /**< buffer memory */
+   const BMS_BUFMEM*     buffer              /**< buffer memory */
    );
 
 /** outputs statistics about currently allocated buffers to the screen */

src/scip/bandit_ucb.c

@@ -177,7 +177,6 @@ SCIP_DECL_BANDITSELECT(SCIPbanditSelectUcb)
       assert(meanscores != NULL);
 
       /* compute the confidence width factor that is common for all actions */
-      /* cppcheck-suppress unpreciseMathCall */
       widthfactor = banditdata->alpha * LOG1P((SCIP_Real)banditdata->nselections);
       widthfactor = sqrt(widthfactor);
       maxucb = -1.0;
@@ -283,7 +282,6 @@ SCIP_Real SCIPgetConfidenceBoundUcb(
    assert(banditdata->counter[action] > 0);
    uppercb = banditdata->meanscores[action];
 
-   /* cppcheck-suppress unpreciseMathCall */
    uppercb += sqrt(banditdata->alpha * LOG1P((SCIP_Real)banditdata->nselections) / (SCIP_Real)banditdata->counter[action]);
 
    return uppercb;

src/scip/benders.c

@@ -1978,19 +1978,17 @@ SCIP_RETCODE checkSubproblemConvexity(
          SCIPbendersSetSubproblemType(benders, probnumber, SCIP_BENDERSSUBTYPE_NONCONVEXDIS);
       else
          SCIPABORT();
-   }
 
-   /* setting the non-linear subproblem flag */
-   if( probnumber >= 0 )
+      /* setting the non-linear subproblem flag */
       SCIPbendersSetSubproblemIsNonlinear(benders, probnumber, isnonlinear);
-   else
-      SCIPbendersSetMasterIsNonlinear(benders, isnonlinear);
 
-   if( probnumber >= 0 )
-   {
       SCIPsetDebugMsg(set, "subproblem <%s> has been found to be of type %d\n", SCIPgetProbName(subproblem),
          SCIPbendersGetSubproblemType(benders, probnumber));
    }
+   else
+   {
+      SCIPbendersSetMasterIsNonlinear(benders, isnonlinear);
+   }
 
    /* releasing the fixed variable hashmap */
    if( assumevarfixed != NULL )
@@ -2586,15 +2584,13 @@ SCIP_RETCODE checkSubproblemIndependence(
    /* looping over all subproblems to check whether there exists at least one master problem variable */
    for( i = 0; i < nsubproblems; i++ )
    {
-      SCIP_Bool independent = FALSE;
-
       /* if there are user defined solving or freeing functions, then it is not possible to declare the independence of
        * the subproblems.
        */
       if( benders->benderssolvesubconvex == NULL && benders->benderssolvesub == NULL
          && benders->bendersfreesub == NULL )
       {
-         independent = TRUE;
+         SCIP_Bool independent = TRUE;
 
          for( j = 0; j < nvars; j++ )
          {
@@ -3501,7 +3497,7 @@ SCIP_RETCODE solveBendersSubproblems(
           */
          if( solveloop == SCIP_BENDERSSOLVELOOP_CIP )
          {
-            if( convexsub || (*substatus)[i] == SCIP_BENDERSSUBSTATUS_INFEAS )
+            if( convexsub )
                solvesub = FALSE;
             else
             {

src/scip/benders.h

@@ -60,7 +60,7 @@ SCIP_RETCODE SCIPbendersCopyInclude(
    SCIP_SET*             targetset,          /**< SCIP_SET of SCIP to copy to */
    SCIP_HASHMAP*         varmap,             /**< a hashmap to store the mapping of source variables corresponding
                                               *   target variables; must not be NULL */
-   SCIP_Bool             copysubproblems,    /**< must the subproblems be copied with the Benders' decomposition copy */
+   SCIP_Bool             threadsafe,         /**< must the Benders' decomposition copy be thread safe */
    SCIP_Bool*            valid               /**< was the copying process valid? */
    );
 
@@ -181,7 +181,7 @@ SCIP_RETCODE SCIPbendersExecSubproblemSolve(
    SCIP_BENDERS*         benders,            /**< Benders' decomposition */
    SCIP_SET*             set,                /**< global SCIP settings */
    SCIP_SOL*             sol,                /**< primal CIP solution */
-   int                   probnum,            /**< the subproblem number */
+   int                   probnumber,         /**< the subproblem number */
    SCIP_BENDERSSOLVELOOP solveloop,          /**< the solve loop iteration. The first iter is for LP, the second for IP */
    SCIP_Bool             enhancement,        /**< is the solve performed as part of an enhancement? */
    SCIP_Bool*            solved,             /**< flag to indicate whether the subproblem was solved */

src/scip/branch_fullstrong.c

@@ -305,7 +305,7 @@ SCIP_RETCODE SCIPselectVarStrongBranching(
     * cycle through the candidates, starting with the position evaluated in the last run
     */
    nsbcalls = 0;
-   bothgains = TRUE;
+   bothgains = FALSE;
    for( i = 0, c = *start; i < nlpcands && (!bothgains || i < ncomplete); ++i, ++c )
    {
       c = c % nlpcands;

src/scip/branch_gomory.c

@@ -118,7 +118,7 @@ struct SCIP_BranchruleData
     * to that form. Specifically, non-basic variables at their lower bound are shifted so that the lower
     * bound is 0 and non-basic at their upper bound are complemented. */
 static
-SCIP_Bool getGMIFromRow(
+void getGMIFromRow(
    SCIP*                 scip,               /**< SCIP data structure */
    int                   ncols,              /**< Number of columns (original variables) in the LP */
    int                   nrows,              /**< Number of rows (slack variables) in the LP */
@@ -334,8 +334,6 @@ SCIP_Bool getGMIFromRow(
          }
       }
    }
-
-   return TRUE;
 }
 
 
@@ -397,7 +395,6 @@ SCIP_DECL_BRANCHEXECLP(branchExeclpGomory)
    SCIP_Real cutrhs;
    SCIP_Real score;
    SCIP_Real bestscore;
-   SCIP_Bool success;
    int nlpcands;
    int maxncands;
    int ncols;
@@ -506,38 +503,34 @@ SCIP_DECL_BRANCHEXECLP(branchExeclpGomory)
       SCIP_CALL( SCIPgetLPBInvARow(scip, basicvarpos2tableaurow[lppos], binvrow, binvarow, inds, &ninds) );
 
       /* Compute the GMI cut */
-      success = getGMIFromRow(scip, ncols, nrows, cols, rows, binvrow, binvarow, &lpcandssol[i], cutcoefs,
+      getGMIFromRow(scip, ncols, nrows, cols, rows, binvrow, binvarow, &lpcandssol[i], cutcoefs,
          &cutrhs, branchruledata->useweakercuts);
 
       /* Calculate the weighted sum score of measures */
-      if ( success )
+      cut = NULL;
+      SCIP_CALL( SCIPcreateEmptyRowUnspec(scip, &cut, name, -SCIPinfinity(scip), cutrhs, TRUE, FALSE, TRUE) );
+      for( j = 0; j < ncols; ++j )
       {
-         cut = NULL;
-         SCIP_CALL( SCIPcreateEmptyRowUnspec(scip, &cut, name, -SCIPinfinity(scip), cutrhs, TRUE,
-                   FALSE, TRUE) );
-         for( j = 0; j < ncols; ++j )
+         if( !SCIPisZero(scip, cutcoefs[j]) )
          {
-            if( !SCIPisZero(scip, cutcoefs[j]) )
-            {
-               SCIP_CALL( SCIPaddVarToRow(scip, cut, SCIPcolGetVar(cols[j]),
-                                          cutcoefs[SCIPcolGetLPPos(cols[j])]) );
-            }
-         }
-         assert( SCIPgetCutEfficacy(scip, NULL, cut) >= -SCIPfeastol(scip) );
-         if ( branchruledata-> efficacyweight != 0 )
-            score += branchruledata->efficacyweight * SCIPgetCutEfficacy(scip, NULL, cut);
-         if ( branchruledata->objparallelweight != 0 )
-            score += branchruledata->objparallelweight * SCIPgetRowObjParallelism(scip, cut);
-         if ( branchruledata->intsupportweight != 0 )
-            score += branchruledata->intsupportweight * SCIPgetRowNumIntCols(scip, cut) / (SCIP_Real) SCIProwGetNNonz(cut);
-         SCIP_CALL( SCIPreleaseRow(scip, &cut) );
-
-         /* Replace the best cut if score is higher */
-         if (score > bestscore) {
-            bestscore = score;
-            bestcand = i;
+            SCIP_CALL( SCIPaddVarToRow(scip, cut, SCIPcolGetVar(cols[j]), cutcoefs[SCIPcolGetLPPos(cols[j])]) );
          }
       }
+      assert( SCIPgetCutEfficacy(scip, NULL, cut) >= -SCIPfeastol(scip) );
+      if ( branchruledata-> efficacyweight != 0 )
+         score += branchruledata->efficacyweight * SCIPgetCutEfficacy(scip, NULL, cut);
+      if ( branchruledata->objparallelweight != 0 )
+         score += branchruledata->objparallelweight * SCIPgetRowObjParallelism(scip, cut);
+      if ( branchruledata->intsupportweight != 0 )
+         score += branchruledata->intsupportweight * SCIPgetRowNumIntCols(scip, cut) / (SCIP_Real) SCIProwGetNNonz(cut);
+      SCIP_CALL( SCIPreleaseRow(scip, &cut) );
+
+      /* Replace the best cut if score is higher */
+      if (score > bestscore)
+      {
+         bestscore = score;
+         bestcand = i;
+      }
    }
 
    /* Free temporary memory */