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

Author: scip-ci

src/scip/cons_nonlinear.c

@@ -1375,6 +1375,15 @@ SCIP_RETCODE createCons(
       return SCIP_INVALIDCALL;
    }
 
+
+   if( isnan(lhs) || isnan(rhs) )
+   {
+      SCIPerrorMessage("%s hand side of nonlinear constraint <%s> is nan\n",
+            isnan(lhs) ? "left" : "right", name);
+      return SCIP_INVALIDDATA;
+   }
+
+
    /* create constraint data */
    SCIP_CALL( SCIPallocClearBlockMemory(scip, &consdata) );
 
@@ -12856,10 +12865,30 @@ SCIP_RETCODE SCIPcreateConsQuadraticNonlinear(
 {
    SCIP_CONSHDLR* conshdlr;
    SCIP_EXPR* expr;
+   int i;
 
    assert(nlinvars == 0 || (linvars != NULL && lincoefs != NULL));
    assert(nquadterms == 0 || (quadvars1 != NULL && quadvars2 != NULL && quadcoefs != NULL));
 
+   /* check data for infinity or nan values */
+   for( i = 0; i < nlinvars; ++i )
+   {
+      if( !SCIPisFinite(lincoefs[i]) || SCIPisInfinity(scip, lincoefs[i]) )
+      {
+         SCIPerrorMessage("Infinite or nan coefficient of variable %s in quadratic constraint %s\n", SCIPvarGetName(linvars[i]), name);
+         return SCIP_INVALIDDATA;
+      }
+   }
+   for( i = 0; i < nquadterms; ++i )
+   {
+      if( !SCIPisFinite(quadcoefs[i]) || SCIPisInfinity(scip, quadcoefs[i]) )
+      {
+         SCIPerrorMessage("Infinite or nan coefficient of term %s*%s in quadratic constraint %s\n", SCIPvarGetName(quadvars1[i]), SCIPvarGetName(quadvars2[i]), name);
+         return SCIP_INVALIDDATA;
+      }
+   }
+   /* lhs and rhs will be checked in createCons */
+
    /* get nonlinear constraint handler */
    conshdlr = SCIPfindConshdlr(scip, CONSHDLR_NAME);
    if( conshdlr == NULL )
@@ -12939,6 +12968,37 @@ SCIP_RETCODE SCIPcreateConsBasicSOCNonlinear(
 
    assert(vars != NULL || nvars == 0);
 
+   /* check values for infinity or nan */
+   for( i = 0; i < nvars; ++i )
+   {
+      if( !SCIPisFinite(coefs[i]) || SCIPisInfinity(scip, coefs[i]) )
+      {
+         SCIPerrorMessage("Second-order cone term with infinite or nan coefficient of variable %s in nonlinear constraint %s\n", SCIPvarGetName(vars[i]), name);
+         return SCIP_INVALIDDATA;
+      }
+      if( offsets != NULL && (!SCIPisFinite(offsets[i]) || SCIPisInfinity(scip, coefs[i])) )
+      {
+         SCIPerrorMessage("Second-order cone term with infinite or nan offset for variable %s in nonlinear constraint %s\n", SCIPvarGetName(vars[i]), name);
+         return SCIP_INVALIDDATA;
+      }
+   }
+   if( !SCIPisFinite(constant) || SCIPisInfinity(scip, constant) )
+   {
+         SCIPerrorMessage("Second-order cone constant with infinite or nan value in nonlinear constraint %s\n", name);
+         return SCIP_INVALIDDATA;
+   }
+   if( !SCIPisFinite(rhscoeff) || SCIPisInfinity(scip, rhscoeff) )
+   {
+         SCIPerrorMessage("Infinite or nan coefficient of right hand side variable in second-order cone constraint %s\n", name);
+         return SCIP_INVALIDDATA;
+   }
+   if( !SCIPisFinite(rhsoffset) || SCIPisInfinity(scip, rhsoffset) )
+   {
+         SCIPerrorMessage("Infinite or nan right hand side offset in second-order cone constraint %s\n", name);
+         return SCIP_INVALIDDATA;
+   }
+   /* lhs and rhs will be checked in createCons */
+
    SCIP_CALL( SCIPcreateExprSum(scip, &lhssum, 0, NULL, NULL, constant, NULL, NULL) );  /* gamma */
    for( i = 0; i < nvars; ++i )
    {
@@ -13009,6 +13069,24 @@ SCIP_RETCODE SCIPcreateConsBasicSignpowerNonlinear(
    assert(x != NULL);
    assert(z != NULL);
 
+   if( !SCIPisFinite(exponent) )
+   {
+      SCIPerrorMessage("exponent in nonlinear signpower constraint <%s> is infinite or nan\n", name);
+      return SCIP_INVALIDDATA;
+   }
+
+   if( !SCIPisFinite(xoffset) )
+   {
+      SCIPerrorMessage("argument offset in nonlinear signpower constraint <%s> is infinite or nan\n", name);
+      return SCIP_INVALIDDATA;
+   }
+
+   if( !SCIPisFinite(zcoef) )
+   {
+      SCIPerrorMessage("coefficient of linear variable in nonlinear signpower constraint <%s> is infinite or nan\n", name);
+      return SCIP_INVALIDDATA;
+   }
+
    SCIP_CALL( SCIPcreateExprVar(scip, &xexpr, x, NULL, NULL) );
    if( xoffset != 0.0 )
    {

src/scip/expr_pow.c

@@ -2719,7 +2719,7 @@ SCIP_DECL_EXPRPARSE(parseSignpower)
       return SCIP_READERROR;
    }
 
-   if( exponent <= 1.0 || SCIPisInfinity(scip, exponent) )
+   if( exponent <= 1.0 || !SCIPisFinite(exponent) || SCIPisInfinity(scip, exponent) )
    {
       SCIPerrorMessage("Expected finite exponent >= 1.0 for signpower().\n");
       return SCIP_READERROR;

src/scip/expr_xyz.c

@@ -149,6 +149,8 @@ SCIP_DECL_EXPRPARSE(parseXyz)
 {  /*lint --e{715}*/
    assert(expr != NULL);
 
+   /* check values for nan and infinity if needed */
+
    SCIPerrorMessage("method of xyz expression handler not implemented yet\n");
    SCIPABORT(); /*lint --e{527}*/
 

src/scip/scip_expr.c

@@ -241,6 +241,11 @@ SCIP_RETCODE parseBase(
          return SCIP_READERROR;
       }
       debugParse("Parsed value %g, creating a value-expression.\n", value);
+      if( !SCIPisFinite(value) || SCIPisInfinity(scip, value) )
+      {
+         SCIPerrorMessage("Infinite or nan term value expression within nonlinear expression %s\n", expr);
+         return SCIP_INVALIDDATA;
+      }
       SCIP_CALL( SCIPcreateExprValue(scip, basetree, value, ownercreate, ownercreatedata) );
    }
    else if( isalpha(*expr) )
@@ -403,6 +408,13 @@ SCIP_RETCODE parseFactor(
          }
       }
 
+      if( !SCIPisFinite(exponent) || SCIPisInfinity(scip, exponent) )
+      {
+         SCIPerrorMessage("Infinite or nan term exponent in nonlinear expression %s\n", expr);
+         SCIP_CALL( SCIPreleaseExpr(scip, &basetree) );
+         return SCIP_INVALIDDATA;
+      }
+
       debugParse("parsed the exponent %g\n", exponent); /*lint !e506 !e681*/
    }
    else
@@ -572,6 +584,13 @@ SCIP_RETCODE parseExpr(
          /* check if we have a "coef * <term>" */
          if( SCIPstrToRealValue(expr, &coef, (char**)newpos) )
          {
+            if( !SCIPisFinite(coef) || SCIPisInfinity(scip, coef) )
+            {
+               SCIPerrorMessage("Infinite or nan term coefficient in nonlinear expression %s\n", expr);
+               SCIP_CALL( SCIPreleaseExpr(scip, exprtree) );
+               return SCIP_INVALIDDATA;
+            }
+
             SCIP_CALL( SCIPskipSpace((char**)newpos) );
 
             if( **newpos == '<' )