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

Author: scip-ci

check/check_xpress.awk

@@ -180,11 +180,31 @@ BEGIN {
    if( feasible == 1 )
       db = $4;
 }
+/^Final MINLP objective/ {
+   if( $6 ~ /:$/ )
+      pb = $7;
+   else
+      pb = $6;
+   feasible = 1;
+}
+/^Final MINLP bound/ {
+   if( feasible == 1 ) {
+      if( $5 ~ /:$/ )
+         db = $6;
+      else
+         db = $5;
+   }
+}
 /^Problem is integer infeasible/ {
    db = infty;
    pb = infty;
    feasible = 0;
 }
+/solve infeasible/ {
+   db = infty;
+   pb = infty;
+   feasible = 0;
+}
 /^Optimal solution found/ {
    aborted = 0;
    feasible = 1;
@@ -206,20 +226,25 @@ BEGIN {
    if( tottime == 0.0 )
       tottime = $1 / 1000000;
 }
-/^ \*\*\* Search completed \*\*\*     Time:/ {
-   bbnodes = $8;
-   tottime = $6;
+/\*\*\* Search completed \*\*\*/ {
    aborted = 0;
 }
-/^ \*\*\* Search unfinished \*\*\*    Time:/ {
-   bbnodes = $8;
-   tottime = $6;
+/\*\*\* Search unfinished \*\*\*/ {
    aborted = 0;
+}
+/  Number of solutions found \/ nodes/ {
+   bbnodes = $10;
+}
+/  Solution time \/ primaldual integral/ {
+   gsub(/s.*/, "", $7);
+   tottime = $7;
+}
+/\*\*\* Time limit reached \*\*\*/ {
    timeout = 1;
 }
-/^simplexiter/{
-   iters = 1;
-   next;
+/^simplexiter/ {
+   getline;
+   iters = $1;
 }
 
 #

check/configuration_tmpfile_setup_xpress.sh

@@ -101,6 +101,7 @@ echo miprelstop = 0.0                                           >> "${TMPFILE}"
 # set non-default feasibility tolerance
 if test "${FEASTOL}" != "default"
 then
+    echo feastol = "${FEASTOL}"                                 >> "${TMPFILE}"
     echo miptol = "${FEASTOL}"                                  >> "${TMPFILE}"
 fi
 echo "maxnode = ${NODELIMIT}"                                   >> "${TMPFILE}"
@@ -114,7 +115,7 @@ echo "treememorysavingtarget = 0.0"                             >> "${TMPFILE}"
 
 echo "format \"timelimit %g\" \$maxtime"                        >> "${TMPFILE}"
 echo "format \"mipgap %g\" \$miprelstop"                        >> "${TMPFILE}"
-echo "format \"feastol %g\" \$miptol"                           >> "${TMPFILE}"
+echo "format \"feastol %g\" \$feastol"                          >> "${TMPFILE}"
 echo "format \"nodelimit %g\" \$maxnode"                        >> "${TMPFILE}"
 echo "format \"memlimit %g\" \$treememorylimit"                 >> "${TMPFILE}"
 echo "format \"percentmemtofile %g\" \$treememorysavingtarget"  >> "${TMPFILE}"

check/evaluate.sh

@@ -47,6 +47,12 @@ TSTNAME=$(echo "${BASENAME}" | sed 's/check.\([a-zA-Z0-9_-]*\).*/\1/g')
 # detect test used solver
 SOLVER=$(echo "${BASENAME}" | sed 's/check.\([a-zA-Z0-9_-]*\).\([a-zA-Z0-9_]*\).*/\2/g')
 
+# xpress executable is called optimizer
+if test "${SOLVER}" = "optimizer"
+then
+    SOLVER="xpress"
+fi
+
 echo "Testset ${TSTNAME}"
 echo "Solver  ${SOLVER}"