Compare commits

...

2 Commits

Author SHA1 Message Date
7b7432b944 Add more CPLEX paths 2017-08-08 09:00:58 -04:00
78decb06c7 Lifting: Reduce number of sets to 1 2017-08-07 10:00:33 -04:00
2 changed files with 6 additions and 4 deletions

View File

@@ -1,4 +1,5 @@
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
$ENV{HOME}/lib/
/opt/cplex-12.6/cplex/lib/x86-64_linux/static_pic
/software/cplex-12.6/distribution/cplex/lib/x86-64_linux/static_pic
/Users/axavier/Applications/IBM/ILOG/CPLEX_Studio1262/cplex/lib/x86-64_osx/static_pic)
@@ -7,9 +8,10 @@ find_library(CPLEX_LIBRARIES
NAMES cplex cplex1220 cplex1240 cplex1260 cplex1261 cplex1262)
find_path(CPLEX_INCLUDE_DIR NAMES ilcplex/cplex.h PATHS
/Users/axavier/Applications/IBM/ILOG/CPLEX_Studio1262/cplex/include
/software/cplex-12.6/distribution/cplex/include/
/opt/cplex-12.6/cplex/include/)
$ENV{HOME}/include/
/opt/cplex-12.6/cplex/include/
/Users/axavier/Applications/IBM/ILOG/CPLEX_Studio1262/cplex/include/
/software/cplex-12.6/distribution/cplex/include/)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(

View File

@@ -41,7 +41,7 @@
/*
* Maximum number of sets that should be considered
*/
#define MAX_N_SETS 1000
#define MAX_N_SETS 1
/*
* Number of rays that should be generated per set.