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

CHANGELOG

@@ -148,6 +148,7 @@ Fixed bugs
 - maintain definition of artificial integral variables in xor constraints to avoid invalidations of conflict constraints
 - free childless nodes only after the deactivation of the old focus path in treeSwitchPath() of tree.c
 - only normalize rows for column norm evaluations in heur_shiftandpropagate.c to avoid unscaled violations
+- expression handler for absolute value computes now also a cut when one of the bounds is infinite as long as the sign of the argument is known
 
 Performance improvements
 ------------------------

src/scip/cons_nonlinear.c

@@ -807,7 +807,7 @@ SCIP_RETCODE freeVarExprs(
 
    assert(consdata != NULL);
 
-   /* skip if we have stored the variable expressions already*/
+   /* skip if we have stored the variable expressions already */
    if( consdata->varexprs == NULL )
       return SCIP_OKAY;
 
@@ -14095,7 +14095,7 @@ SCIP_RETCODE SCIPaddExprNonlinear(
 
    if( SCIPgetStage(scip) != SCIP_STAGE_PROBLEM )
    {
-      SCIPerrorMessage("SCIPaddLinearVarNonlinear can only be called in problem stage.\n");
+      SCIPerrorMessage("SCIPaddExprNonlinear can only be called in problem stage.\n");
       return SCIP_INVALIDCALL;
    }
 

src/scip/expr_abs.c

@@ -89,7 +89,7 @@ SCIP_RETCODE computeCutsAbs(
       ub = bounds.sup;
 
       /* it does not make sense to add a cut if child variable is unbounded or fixed */
-      if( !SCIPisInfinity(scip, -lb) && !SCIPisInfinity(scip, ub) && !SCIPisEQ(scip, lb, ub) )
+      if( !SCIPisEQ(scip, lb, ub) )
       {
          if( !SCIPisPositive(scip, ub) )
          {
@@ -105,7 +105,7 @@ SCIP_RETCODE computeCutsAbs(
             constant[*nreturned] = 0.0;
             (*nreturned)++;
          }
-         else
+         else if( !SCIPisInfinity(scip, -lb) && !SCIPisInfinity(scip, ub) )
          {
             /* z = abs(x), x still has mixed sign */
             SCIP_Real alpha;