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

CHANGELOG

@@ -118,6 +118,8 @@ Fixed bugs
 - enable parameter limits/restarts by allowing to reach the restart limit in restartAllowed()
 - handle normalizing linear constraints in presolving with more caution to avoid numerical difficulties for integer variables with large coefficients
 - use quad precision to calculate residual activity bounds to reduce numerical errors for large variable bounds in cons_linear.c
+- in SCIPsolveProbingLP() when objective has been changed do not return cutoff due to exceeding the cutoff bound
+- set probing LP to be a relaxation only when objective has not been changed
 
 Miscellaneous
 -------------

src/scip/scip_probing.c

@@ -745,7 +745,8 @@ SCIP_RETCODE solveProbingLP(
    /* load the LP state (if necessary) */
    SCIP_CALL( SCIPtreeLoadProbingLPState(scip->tree, scip->mem->probmem, scip->set, scip->transprob, scip->eventqueue, scip->lp) );
 
-   SCIPlpSetIsRelax(scip->lp, TRUE);
+   /* the LP is a relaxation if and only if the objective has not been changed */
+   SCIPlpSetIsRelax(scip->lp, !scip->tree->probingobjchanged);
 
    /* solve probing LP */
    SCIP_CALL( SCIPlpSolveAndEval(scip->lp, scip->set, scip->messagehdlr, scip->mem->probmem, scip->stat,
@@ -785,7 +786,7 @@ SCIP_RETCODE solveProbingLP(
    /* the LP is infeasible or the objective limit was reached */
    if( !(*lperror) && (SCIPlpGetSolstat(scip->lp) == SCIP_LPSOLSTAT_INFEASIBLE
          || SCIPlpGetSolstat(scip->lp) == SCIP_LPSOLSTAT_OBJLIMIT ||
-         (SCIPlpGetSolstat(scip->lp) == SCIP_LPSOLSTAT_OPTIMAL
+         (SCIPlpGetSolstat(scip->lp) == SCIP_LPSOLSTAT_OPTIMAL && !scip->tree->probingobjchanged
             && SCIPisGE(scip, SCIPgetLPObjval(scip), SCIPgetCutoffbound(scip)))) )
    {
       /* analyze the infeasible LP (only if all columns are in the LP and no external pricers exist) */