File tree 1 file changed +2
-2
lines changed
1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -678,7 +678,7 @@ if((${TEST_BENDERSQP} AND (NOT ${LPS} STREQUAL "msk" )) OR (NOT ${prefix} STREQU
678
678
#
679
679
# treat the instance as a tuple (list) of two values
680
680
#
681
- if (NOT ((${basename} STREQUAL "classical_30_0.mps" ) AND (${LPS} STREQUAL "grb" )))
681
+ if (NOT ((${basename} STREQUAL "classical_30_0.mps" ) AND (( ${LPS} STREQUAL "grb" ) OR ( ${LPS} STREQUAL "cpx" ) )))
682
682
add_test (NAME ${prefix} -${setting} -${basename}
683
683
COMMAND $<TARGET_FILE:scip> -c "set load ${PROJECT_SOURCE_DIR} /check/coverage/settings/${setting} .set read ${PROJECT_SOURCE_DIR} /check/${instpath} read ${PROJECT_SOURCE_DIR} /check/${decpath} opt validatesol ${optval} ${optval} q"
684
684
)
@@ -688,7 +688,7 @@ if((${TEST_BENDERSQP} AND (NOT ${LPS} STREQUAL "msk" )) OR (NOT ${prefix} STREQU
688
688
FAIL_REGULAR_EXPRESSION "ERROR|user parameter file <${PROJECT_SOURCE_DIR} /check/coverage/settings/${setting} .set> not found"
689
689
DEPENDS scip-build
690
690
)
691
- endif () # separation does not converge, #3724 (LPS=grb, BendersQP-benders-qp-classical_30_0.mps)
691
+ endif () # separation does not converge, #3724 (LPS=grb or LPS=cpx , BendersQP-benders-qp-classical_30_0.mps)
692
692
endforeach (setting)
693
693
endforeach (instance)
694
694
endif ()
You can’t perform that action at this time.
0 commit comments