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

CHANGELOG

@@ -38,6 +38,9 @@ Features
 - added a new separator sepa_lagromory to generate Lagromory cuts in a relax-and-cut framework, i.e., GMI cuts generated
   at different bases that are explored in the process of solving the Lagrangian dual problem at a node. This separator
   is OFF by default.
+- when parsing nonlinear constraints from CIP files, the * after the number in a term is now optional if followed by a variable,
+  i.e., instead of 3*<x>*<y>, now also 3<x>*<y> can be read, but 3<x><y> is not supported;
+  this allows to read some CIP files that were written with SCIP < 8
 
 Performance improvements
 ------------------------

src/scip/scip_expr.c

@@ -574,19 +574,28 @@ SCIP_RETCODE parseExpr(
          {
             SCIP_CALL( SCIPskipSpace((char**)newpos) );
 
-            if( **newpos != '*' )
+            if( **newpos == '<' )
             {
-               /* no '*', so fall back to parsing term after sign */
-               coef = (*expr == '+') ? 1.0 : -1.0;
-               ++expr;
+               /* found variable name ('*' is considered optional);
+                * keep coefficient in coef and continue parsing term after coefficient
+                */
+               expr = *newpos;
+
+               SCIP_CALL( SCIPskipSpace((char**)&expr) );
             }
-            else
+            else if( **newpos == '*' )
             {
                /* keep coefficient in coef and continue parsing term after coefficient */
                expr = (*newpos)+1;
 
                SCIP_CALL( SCIPskipSpace((char**)&expr) );
             }
+            else
+            {
+               /* term consists of single value; let parseTerm() below parse it */
+               coef = (*expr == '+') ? 1.0 : -1.0;
+               ++expr;
+            }
          }
          else
          {
@@ -1358,7 +1367,7 @@ SCIP_RETCODE SCIPcopyExpr(
  *
  * The actual definition:
  * <pre>
- * Expression -> ["+" | "-"] Term { ("+" | "-" | "number *") ] Term }
+ * Expression -> ["+" | "-"] Term { [ ("+" | "-" | "number *") Term | ("number" <varname>) ] }
  * Term       -> Factor { ("*" | "/" ) Factor }
  * Factor     -> Base [ "^" "number" | "^(" "number" ")" ]
  * Base       -> "number" | "<varname>" | "(" Expression ")" | Op "(" OpExpression ")

src/scip/scip_expr.h

@@ -277,7 +277,7 @@ SCIP_RETCODE SCIPcopyExpr(
  *
  * The actual definition:
  * <pre>
- * Expression -> ["+" | "-"] Term { ("+" | "-" | "number *") ] Term }
+ * Expression -> ["+" | "-"] Term { [ ("+" | "-" | "number *") Term | ("number" <varname>) ] }
  * Term       -> Factor { ("*" | "/" ) Factor }
  * Factor     -> Base [ "^" "number" | "^(" "number" ")" ]
  * Base       -> "number" | "<varname>" | "(" Expression ")" | Op "(" OpExpression ")