Merge remote-tracking branch 'origin/v90-bugfix'

src/scip/cons_nonlinear.c

@@ -3373,7 +3373,7 @@ SCIP_RETCODE detectNlhdlr(
       nlhdlrparticipating = SCIP_NLHDLR_METHOD_NONE;
       conshdlrdata->registerusesactivitysepabelow = FALSE;  /* SCIPregisterExprUsageNonlinear() as called by detect may set this to TRUE */
       conshdlrdata->registerusesactivitysepaabove = FALSE;  /* SCIPregisterExprUsageNonlinear() as called by detect may set this to TRUE */
-      /* coverity[forward_null] */
+      /* coverity[var_deref_model] */
       SCIP_CALL( SCIPnlhdlrDetect(scip, ownerdata->conshdlr, nlhdlr, expr, cons, &enforcemethodsnew, &nlhdlrparticipating, &nlhdlrexprdata) );
 
       /* nlhdlr might have claimed more than needed: clean up sepa flags */

src/scip/heur_padm.c

@@ -23,12 +23,14 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /**@file   heur_padm.c
- * @brief  PADM primal heuristic based on ideas published in the paper
- *         "A Decomposition Heuristic for Mixed-Integer Supply Chain Problems"
- *         by Martin Schmidt, Lars Schewe, and Dieter Weninger
+ * @brief  PADM primal heuristic
  * @author Dieter Weninger
  * @author Katrin Halbig
  *
+ * Primal heuristic based on ideas published in the papers
+ * "A Decomposition Heuristic for Mixed-Integer Supply Chain Problems" by Martin Schmidt, Lars Schewe, and Dieter Weninger,
+ * and "Exploiting user-supplied Decompositions inside Heuristics" by Katrin Halbig, Adrian Göß and Dieter Weninger.
+ *
  * The penalty alternating direction method (PADM) heuristic is a construction heuristic which additionally needs a
  * user decomposition with linking variables only.
  *

src/scip/heur_padm.h

@@ -24,12 +24,14 @@
 
 /**@file   heur_padm.h
  * @ingroup PRIMALHEURISTICS
- * @brief  PADM primal heuristic based on ideas published in the paper
- *         "A Decomposition Heuristic for Mixed-Integer Supply Chain Problems"
- *         by Martin Schmidt, Lars Schewe, and Dieter Weninger
+ * @brief  PADM primal heuristic
  * @author Dieter Weninger
  * @author Katrin Halbig
  *
+ * Primal heuristic based on ideas published in the papers
+ * "A Decomposition Heuristic for Mixed-Integer Supply Chain Problems" by Martin Schmidt, Lars Schewe, and Dieter Weninger,
+ * and "Exploiting user-supplied Decompositions inside Heuristics" by Katrin Halbig, Adrian Göß and Dieter Weninger.
+ *
  * The penalty alternating direction method (PADM) heuristic is a construction heuristic which additionally needs a
  * user decomposition with linking variables only.
  *

src/scip/nlhdlr_perspective.c

@@ -258,7 +258,7 @@ SCIP_RETCODE addSCVarIndicator(
    /* move entries if needed */
    for( i = scvdata->nbnds; i > pos; --i )
    {
-      /* coverity[forward_null] */
+      /* coverity[var_deref_op] */
       scvdata->bvars[i] = scvdata->bvars[i-1];
       scvdata->vals0[i] = scvdata->vals0[i-1];
       scvdata->lbs1[i] = scvdata->lbs1[i-1];
@@ -419,7 +419,7 @@ SCIP_RETCODE varIsSemicontinuous(
    assert(vubvars != NULL || nvubs == 0);
    for( c = 0; c < nvubs; ++c )
    {
-      /* coverity[forward_null] */
+      /* coverity[var_deref_op] */
       if( SCIPvarGetType(vubvars[c]) != SCIP_VARTYPE_BINARY )  /*lint !e613*/
          continue;
 

src/scip/nlpi_xyz.c

@@ -39,6 +39,7 @@
 #include "scip/scip_numerics.h"
 #include "scip/scip_nlp.h"
 #include "scip/scip_nlpi.h"
+#include "scip/pub_message.h"
 
 #define NLPI_NAME              "xyz"                       /**< short concise name of solver */
 #define NLPI_DESC              "solver interface template" /**< description of solver */

src/scip/sepa_rlt.c

@@ -1647,7 +1647,7 @@ SCIP_RETCODE createSepaData(
           SCIPvarIsRelaxationOnly(bilinterms[i].y)) )
          continue;
 
-      /* coverity[forward_null] */
+      /* coverity[var_deref_model] */
       SCIP_CALL( addProductVars(scip, sepadata, bilinterms[i].x, bilinterms[i].y, varmap,
             bilinterms[i].nlockspos + bilinterms[i].nlocksneg) );
    }
@@ -1656,7 +1656,7 @@ SCIP_RETCODE createSepaData(
    {
       int oldnterms = sepadata->nbilinterms;
 
-      /* coverity[forward_null] */
+      /* coverity[var_deref_model] */
       SCIP_CALL( detectHiddenProducts(scip, sepadata, varmap) );
 
       /* update nbilinterms and bilinterms, as detectHiddenProducts might have found new terms */
@@ -2081,6 +2081,7 @@ SCIP_RETCODE addRltTerm(
    if( !SCIPisZero(scip, coefauxvar) )
    {
       assert(auxvar != NULL);
+      /* coverity[var_deref_model] */
       SCIP_CALL( SCIPaddVarToRow(scip, cut, auxvar, coefauxvar) );
    }