Upgraded to SCIP 7.0.2.

ed-lam · Apr 15, 2021 · 3c2ccdd · 3c2ccdd
1 parent 78f226f
commit 3c2ccdd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,13 +64,13 @@ set(TPI none)
 set(tpisources tpi/tpi_none.c)
 set(THREAD_LIBRARIES "")
 set(TPI_NONE on)
-configure_file(scipoptsuite-7.0.1/scip/src/scip/config.h.in ${CMAKE_BINARY_DIR}/scip/config.h @ONLY)
+configure_file(scipoptsuite-7.0.2/scip/src/scip/config.h.in ${CMAKE_BINARY_DIR}/scip/config.h @ONLY)
 include_directories(${CMAKE_BINARY_DIR})
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ldl")
 endif ()
-add_subdirectory(scipoptsuite-7.0.1/scip/ EXCLUDE_FROM_ALL)
-include_directories(SYSTEM scipoptsuite-7.0.1/scip/src/)
+add_subdirectory(scipoptsuite-7.0.2/scip/ EXCLUDE_FROM_ALL)
+include_directories(SYSTEM scipoptsuite-7.0.2/scip/src/)
 
 # Link to math library.
 find_library(LIBM m)

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ BCP is implemented in C++17 and is compiled using CMake, so you will need a rece
 
 BCP calls SCIP for branch-and-bound and calls CPLEX for solving the linear relaxation.
 
-Source code to SCIP is available free (as in beer) strictly for academic use. BCP is tested with SCIP 7.0.1. Download the [SCIP Optimization Suite 7.0.1](https://scip.zib.de) and extract it into the root of this repository. You should find the subdirectory `scipoptsuite-7.0.1/scip/src`.
+Source code to SCIP is available free (as in beer) strictly for academic use. BCP is tested with SCIP 7.0.2. Download the [SCIP Optimization Suite 7.0.2](https://scip.zib.de) and extract it into the root of this repository. You should find the subdirectory `scipoptsuite-7.0.2/scip/src`.
 
 CPLEX is commercial software but has binaries available free under an [academic license](https://developer.ibm.com/docloud/blog/2019/07/04/cplex-optimization-studio-for-students-and-academics/). BCP is tested with CPLEX 12.10. You should find the subdirectory `cplex`.