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

CHANGELOG

@@ -199,7 +199,7 @@ Miscellaneous
 -------------
 
 - the output precision for writing CIP/OPB files has been increased at several places for nonlinear constraints
-- the solchecker tool now also supports SCIP solution format
+- the solchecker tool now also supports SCIP solutions without unknown or infinite values
 
 Known bugs
 ----------

check/run.sh

@@ -155,16 +155,8 @@ fi
 
 if test -e "${SOLFILE}"
 then
-    # translate SCIP solution format into format for solution checker. The
-    # SOLFILE format is a very simple format where in each line we have a
-    # <variable, value> pair, separated by spaces.  A variable name of
-    # =obj= is used to store the objective value of the solution, as
-    # computed by the solver. A variable name of =infeas= can be used to
-    # indicate that an instance is infeasible.
-    sed ' /solution status:/d;
-    s/objective value:/=obj=/g;
-    s/infinity/1e+20/g;
-    s/no solution available//g' "${SOLFILE}" > "${TMPFILE}"
+    # workaround infinite values for solution checker
+    sed 's/infinity/1e+20/g' "${SOLFILE}" > "${TMPFILE}"
     mv "${TMPFILE}" "${SOLFILE}"
 
     # check if the link to the solution checker exists

check/run_fscip.sh

@@ -188,16 +188,10 @@ echo                                >> "${OUTFILE}"
 
 if test -e "${SOLFILE}"
 then
-    # translate SCIP solution format into format for solution checker. The
-    # SOLFILE format is a very simple format where in each line we have a
-    # <variable, value> pair, separated by spaces.  A variable name of
-    # =obj= is used to store the objective value of the solution, as
-    # computed by the solver. A variable name of =infeas= can be used to
-    # indicate that an instance is infeasible.
-    sed ' /solution status:/d;
-    /\[ Final Solution \]/d;
-    s/objective value:/=obj=/g;
-    s/No Solution//g' "${SOLFILE}" > "${TMPFILE}"
+    # translate FiberSCIP solution format into SCIP solution format and workaround infinite values for solution checker
+    sed ' /\[ Final Solution \]/d;
+    s/No Solution/no solution available/g;
+    s/infinity/1e+20/g' "${SOLFILE}" > "${TMPFILE}"
     mv "${TMPFILE}" "${SOLFILE}"
 
     # check if the link to the solution checker exists

check/solchecker/src/gmputils.cpp

@@ -169,7 +169,7 @@ bool Rational::isZero() const
    return (mpq_sgn(number) == 0);
 }
 
-void Rational::fromString(const char* num)
+bool Rational::fromString(const char* num)
 {
    char* tmp = &buffer[0];
    int exponent = 0;
@@ -202,6 +202,8 @@ void Rational::fromString(const char* num)
          exponent += atoi(&num[i + 1]);
          break;
       }
+      else
+         return false;
    }
    while( exponent > 0 )
    {
@@ -220,6 +222,8 @@ void Rational::fromString(const char* num)
 
    mpq_set_str(number, tmp, 10);
    mpq_canonicalize(number);
+
+   return true;
 }
 
 std::string Rational::toString() const

check/solchecker/src/gmputils.h

@@ -156,8 +156,9 @@ class Rational
     * This functions essentially parses a number of the form
     * [+|-]?[0-9]*.[0-9]+[[e|E][+|-][0-9]+]?
     * and generates the corresponding fraction.
+    * Returns true if reading successful.
     */
-   void fromString(const char* str);
+   bool fromString(const char* str);
 
    /**
     * Convert a rational number to a string representation.

check/solchecker/src/model.cpp

@@ -461,7 +461,13 @@ bool Model::readSol(const char* filename)
       {
          // read objective value
          hasObjectiveValue = true;
-         objectiveValue.fromString(valuep);
+
+         if( !objectiveValue.fromString(valuep) )
+         {
+            std::cerr << "unexpected objective <" << valuep << "> in solution file" << std::endl;
+            isSolFeas = false;
+            break;
+         }
       }
       else
       {
@@ -476,7 +482,14 @@ bool Model::readSol(const char* filename)
          }
 
          Rational value;
-         value.fromString(valuep);
+
+         if( !value.fromString(valuep) )
+         {
+            std::cerr << "unexpected value <" << valuep << "> in solution file" << std::endl;
+            isSolFeas = false;
+            break;
+         }
+
          var->value = value;
       }
    }