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

scipopt · Nov 4, 2023 · 05bb29d · 05bb29d
2 parents fa403b2 + 00a1271
commit 05bb29d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt
@@ -551,6 +551,7 @@ macro(add_instancetests instances settings prefix)
             #
             if(NOT ((${basename} STREQUAL "blend2.mps") AND (${LPS} STREQUAL "grb")))
             if(NOT ((${setting} STREQUAL "lns_epsgreedy_vanilla") AND (${basename} STREQUAL "blend2.mps") AND (${LPS} STREQUAL "grb")))
+            if(NOT ((${setting} STREQUAL "tolerance") AND (${basename} STREQUAL "blend2.mps") AND (${LPS} STREQUAL "xprs")))
             add_test(NAME ${prefix}-${setting}-${basename}
                     COMMAND $<TARGET_FILE:scip> -f ${PROJECT_SOURCE_DIR}/check/${path} -s ${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set -o ${optval} ${optval}
                     )
@@ -561,6 +562,7 @@ macro(add_instancetests instances settings prefix)
                                     FAIL_REGULAR_EXPRESSION "WARNING: unknown parameter;user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
                                     DEPENDS scip-build
                                 )
+            endif()  # Xpress does not keep feasibility tolerance setting, #3640
             endif()  # Gurobi gets stuck in LP solve, #2833
             endif()  # Gurobi invalid write with settings oddcycle and heurlprows, #3578; just skip this instance for all settings now
         endforeach(setting)

diff --git a/src/lpi/lpi_xprs.c b/src/lpi/lpi_xprs.c
@@ -679,7 +679,7 @@ const char* SCIPlpiGetSolverDesc(
    void
    )
 {
-   return "Linear Programming Solver developed by FICO (www.fico.com/xpress)";
+   return "Linear Programming Solver developed by FICO (www.fico.com/en/products/fico-xpress-optimization)";
 }
 
 /** gets pointer for LP solver - use only with great care