Compare commits

..

No commits in common. '7b7432b944465cb4dcbf279e8ef1dde0dbd0c9d0' and 'cbba14709749fe7496b25ee7e48ddd5f4dba417a' have entirely different histories.

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

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