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

Author: scip-ci

src/blockmemshell/memory.c

@@ -1707,7 +1707,6 @@ void checkBlkmem(
    int i;
 
    assert(blkmem != NULL);
-   assert(blkmem->chkmemhash != NULL);
 
    for( i = 0; i < CHKHASH_SIZE; ++i )
    {
@@ -2153,7 +2152,6 @@ void BMSfreeBlockMemory_work(
    debugMessage("free    %8llu bytes in %p [%s:%d]\n", (unsigned long long)size, *ptr, filename, line);
 
    /* find corresponding chunk block */
-   assert( blkmem->chkmemhash != NULL );
    chkmem = blkmem->chkmemhash[hashnumber];
    while( chkmem != NULL && chkmem->elemsize != (int)size )
       chkmem = chkmem->nextchkmem;

src/rectlu/rectlu_factor.c

@@ -1893,7 +1893,6 @@ static int qsnum_dense_build_matrix(
    f->dense_base = f->stage;
    f->dmat = dmat;
    f->dsize = dsize;
-   dmat = 0;
 
    /* CLEANUP:  */
    return rval;
@@ -3285,8 +3284,8 @@ void QSnum_factor_btran (
    int nzcnt;
    int sparse;
    int *aindx;
-   QSnum_type *acoef = a->coef;
-   QSnum_type *work_coef = f->work_coef;
+   QSnum_type *acoef;
+   QSnum_type *work_coef;
    int dimr;
 
    if( a->nzcnt >= SPARSE_FACTOR * f->dimr )
@@ -3312,7 +3311,7 @@ void QSnum_factor_btran (
    }
    else
    {
-      qsnum_factor_btranu (f, work_coef, &f->xtmp);
+      qsnum_factor_btranu (f, work_coef, &f->xtmp);  /*lint !e644*/
    }
 
    if( f->xtmp.nzcnt >= SPARSE_FACTOR * f->dimr )
@@ -3451,7 +3450,7 @@ int QSnum_svector_alloc(
    int                   nzcnt               /**< nonzero count */
    )
 {
-   int rval = 0;
+   int rval;
 
    s->nzcnt = nzcnt;
    if( nzcnt == 0 )
@@ -3577,8 +3576,10 @@ void RECTLUfreeFactorization(
    qsnum_factor_work*    f                   /**< factor work */
    )
 {
+   assert(f != NULL);
+
    QSnum_factor_free_factor_work (f);
    QSnum_factor_clear ();
-   if (f) free (f);
+   free (f);
 }
 #endif

src/scip/conflict_graphanalysis.c

@@ -2917,13 +2917,10 @@ SCIP_RETCODE conflictsetAddBounds(
                /* replace worse bound change info by tighter bound change info */
                confbdchginfos[k] = confbdchginfos[i];
                confrelaxedbds[k] = confrelaxedbds[i];
-               confsortvals[k] = confsortvals[i];
                ++i;
             }
             else
             {
-               assert(confsortvals[k] == confsortvals[i]);
-
                /* both bound change are equivalent; hence, keep the worse relaxed bound and remove one of them */
                confrelaxedbds[k] = (confsortvals[k] % 2 == 0) ? MAX(confrelaxedbds[k], confrelaxedbds[i]) : MIN(confrelaxedbds[k], confrelaxedbds[i]);
                ++i;

src/scip/cons.c

@@ -8270,7 +8270,6 @@ int SCIPlinConsStatsGetTypeCount(
 {
    assert(linconsstats != NULL);
    assert(0 <= (int)linconstype && (int)linconstype < SCIP_NLINCONSTYPES); /*lint !e587 !e685 !e568*/
-   assert(linconsstats->counter != NULL);
 
    return linconsstats->counter[(int)linconstype];
 }
@@ -8295,7 +8294,6 @@ void SCIPlinConsStatsIncTypeCount(
    assert(linconsstats != NULL);
    assert(increment >= 1);
    assert(0 <= (int)linconstype && (int)linconstype < SCIP_NLINCONSTYPES); /*lint !e587 !e685 !e568*/
-   assert(linconsstats->counter != NULL);
 
    linconsstats->counter[(int)linconstype] += increment;
    linconsstats->sum += increment;

src/scip/cons_knapsack.c

@@ -7671,7 +7671,7 @@ SCIP_RETCODE propagateCons(
                   SCIPdebugMsg(scip, " -> fixing variable <%s> to 0\n", SCIPvarGetName(maxvar));
                   SCIP_CALL( SCIPresetConsAge(scip, cons) );
                   SCIP_CALL( SCIPinferBinvarCons(scip, maxvar, FALSE, cons, cliquestartposs[c], &infeasible, &tightened) );
-                  assert(consdata->onesweightsum == oldonesweightsum);  /* cppcheck-suppress knownConditionTrueFalse */
+                  assert(consdata->onesweightsum == oldonesweightsum);
                   assert(!infeasible);
                   assert(tightened);
                   (*nfixedvars)++;
@@ -8194,7 +8194,6 @@ SCIP_RETCODE detectRedundantVars(
    SCIP_Longint* weights;
    SCIP_Longint capacity;
    SCIP_Longint sum;
-   int noldchgcoefs;
    int nvars;
    int v;
    int w;
@@ -8211,7 +8210,6 @@ SCIP_RETCODE detectRedundantVars(
    assert(consdata->nvars >= 2);
    assert(consdata->weightsum > consdata->capacity);
 
-   noldchgcoefs = *nchgcoefs;
    vars = consdata->vars;
    weights = consdata->weights;
    nvars = consdata->nvars;
@@ -8249,10 +8247,6 @@ SCIP_RETCODE detectRedundantVars(
       return SCIP_OKAY;
    }
 
-   /* if we already found some redundant variables, stop here */
-   if( *nchgcoefs > noldchgcoefs )
-      return SCIP_OKAY;
-
    assert(vars == consdata->vars);
    assert(weights == consdata->weights);
    assert(nvars == consdata->nvars);

src/scip/cons_linking.c

@@ -1287,7 +1287,7 @@ SCIP_RETCODE processBinvarFixings(
          fixedonefound = FALSE;
 #endif
 
-         for( v = 0; v < nvars && consdata->nfixedones == 1 && !(*cutoff); ++v )
+         for( v = 0; v < nvars && consdata->nfixedones == 1 && !(*cutoff); ++v )  /* cppcheck-suppress knownConditionTrueFalse */
          {
             var = vars[v];
             assert(SCIPvarIsBinary(var));
@@ -1329,7 +1329,7 @@ SCIP_RETCODE processBinvarFixings(
       /* now all other variables are fixed to zero:
        * the constraint is feasible, and if it's not modifiable, it is redundant
        */
-      if( !SCIPconsIsModifiable(cons) && consdata->nfixedones == 1 )
+      if( !SCIPconsIsModifiable(cons) && consdata->nfixedones == 1 )  /* cppcheck-suppress knownConditionTrueFalse */
       {
          SCIPdebugMsg(scip, " -> disabling set linking constraint <%s>\n", SCIPconsGetName(cons));
          SCIP_CALL( SCIPdelConsLocal(scip, cons) );

src/scip/cons_logicor.c

@@ -2620,7 +2620,6 @@ SCIP_RETCODE removeRedundantNonZeros(
    assert(0 < nentries);
 
    /* temporary exchange the variable for calculating a valid signature */
-   oldvar = vars[artpos];
    vars[artpos] = artvar;
    signature = calcSignature(vars, nvars);
 

src/scip/cons_pseudoboolean.c

@@ -3866,7 +3866,7 @@ SCIP_RETCODE copyConsPseudoboolean(
          assert(ntargetandconss <= ntargetlinvars);
       }
 
-      if( *valid )  /* cppcheck-suppress duplicateCondition */
+      if( *valid )
       {
          SCIP_Real targetrhs;
          SCIP_Real targetlhs;

src/scip/lpexact_bounding.c

@@ -1486,7 +1486,7 @@ SCIP_RETCODE projectShift(
 #endif
 
       /* rval = 0 -> fail */
-      if( rval )  /* cppcheck-suppress knownConditionTrueFalse */
+      if( rval )
       {
          lp->hasprovedbound = FALSE;
          if( usefarkas )

src/scip/network.c

@@ -2277,8 +2277,8 @@ int decompositionGetFundamentalCycleRows(
 
    typedef struct
    {
-      spqr_node node;    /* cppcheck-suppress unusedStructMember */
-      spqr_arc nodeArc;  /* cppcheck-suppress unusedStructMember */
+      spqr_node node;
+      spqr_arc nodeArc;
    } DFSCallData;
    DFSCallData* pathSearchCallStack;
    if( BMSallocBlockMemoryArray(dec->env, &pathSearchCallStack, dec->numNodes) == NULL )