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

Author: scip-ci

src/scip/benders.c

@@ -2086,7 +2086,7 @@ SCIP_RETCODE createSubproblems(
 
             if( objchanged )
             {
-               SCIPverbMessage(subproblem, SCIP_VERBLEVEL_HIGH, NULL, "Benders' decomposition: Objective coefficients of "
+               SCIPverbMessage(subproblem, SCIP_VERBLEVEL_FULL, NULL, "Benders' decomposition: Objective coefficients of "
                   "copy of master problem variables in a subproblem have been changed to zero.\n");
             }
          }

src/scip/benderscut_int.c

@@ -50,6 +50,7 @@
 #include "scip/scip_param.h"
 #include "scip/scip_prob.h"
 #include "scip/scip_sol.h"
+#include "scip/type_message.h"
 #include <string.h>
 
 #define BENDERSCUT_NAME             "integer"
@@ -599,8 +600,8 @@ SCIP_DECL_BENDERSCUTEXEC(benderscutExecInt)
    /* it is only possible to generate the Laporte and Louveaux cuts when the linking variables are all binary */
    if( !benderscutdata->subprobsvalid )
    {
-      SCIPinfoMessage(scip, NULL, "The integer optimality cuts can only be applied to problems "
-         "where all linking variables are binary. The integer optimality cuts will be disabled.\n");
+      SCIPwarningMessage(scip, "The integer optimality cuts have been disabled because some linking variables are not binary.\n"
+         "Since there is at least one non-convex subproblem, i.e. not LP or convex NLP, the problem will be solved heuristically.\n");
 
       SCIPbenderscutSetEnabled(benderscut, FALSE);
 

src/scip/benderscut_nogood.c

@@ -49,6 +49,7 @@
 #include "scip/scip_param.h"
 #include "scip/scip_prob.h"
 #include "scip/scip_sol.h"
+#include "scip/type_message.h"
 #include <string.h>
 
 #define BENDERSCUT_NAME             "nogood"
@@ -376,8 +377,8 @@ SCIP_DECL_BENDERSCUTEXEC(benderscutExecNogood)
    /* it is only possible to generate nogood cuts if all linking variables are binary */
    if( !benderscutdata->subprobsvalid )
    {
-      SCIPinfoMessage(scip, NULL, "The nogood cuts can only be applied to problems "
-         "where all linking variables are binary. The nogood cuts will be disabled.\n");
+      SCIPwarningMessage(scip, "The nogood cuts have been disabled because some linking variables are not binary.\n"
+         "Since there is at least one non-convex subproblem, i.e. not LP or convex NLP, the problem will be solved heuristically.\n");
 
       SCIPbenderscutSetEnabled(benderscut, FALSE);
 

src/scip/relax_benders.c

@@ -900,18 +900,15 @@ SCIP_DECL_RELAXEXEC(relaxExecBenders)
    masterstatus = SCIPgetStatus(relaxdata->masterprob);
 
    SCIPverbMessage(scip, SCIP_VERBLEVEL_NORMAL, NULL,
-      "\nBenders' decomposition solve has completed with status %s.", SCIPstatusName(masterstatus));
+      "\nBenders' decomposition solve has completed.\n\n");
 
    /* if the problem is solved to be infeasible, then the result needs to be set to CUTOFF. */
    if( masterstatus == SCIP_STATUS_INFEASIBLE )
    {
-      SCIPverbMessage(scip, SCIP_VERBLEVEL_NORMAL, NULL, "\n\n");
       (*result) = SCIP_CUTOFF;
       return SCIP_OKAY;
    }
 
-   SCIPverbMessage(scip, SCIP_VERBLEVEL_NORMAL, NULL, " Copying the solution to the original problem variables\n\n");
-
    /* a solution for the original SCIP needs to be created. This will transfer the best found solution from the
     * Benders decomposition solve back to the original SCIP instance.
     */