...
 
Commits (3)
......@@ -26,7 +26,7 @@ DIR = ./
LIB = -lm
# debug switches
SW = -g -std=c++14 -ferror-limit=1
SW = -g -std=c++14 -ferror-limit=1 -lbz2 -lz
# production switches
#SW = -O3 -std=c++11 -DNDEBUG
......
File added
......@@ -27,7 +27,7 @@
#define HAVE_CutPlane 0
// if nonzero, the CutPlane NDOSolver is loaded
#define HAVE_OsiMPSolver 0
#define HAVE_OsiMPSolver 1
// if nonzero, the OsiMPSolver MPSolver is loaded
#if HAVE_CutPlane || HAVE_OsiMPSolver
......
......@@ -30,7 +30,7 @@
libCPXEXTLIB = -framework CoreFoundation -framework IOKit
# basic Cplex directory
libCPXBSCDIR = /Users/frangio/Applications/CPLEX_Studio128/cplex/
libCPXBSCDIR = /Users/gorgone/Applications/CPLEX_Studio128/cplex/
# lib Cplex directory
libCPXINCDIR = $(libCPXBSCDIR)lib/x86-64_osx/static_pic/
......
......@@ -24,7 +24,7 @@
# internal macros - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# basic COIN directory
libOSIBSCDIR = /Users/frangio/Didattica/MDGdM/Problemi/FC++/
libOSIBSCDIR = /Users/gorgone/Applications/coin-or/cbc/
# macroes to be exported- - - - - - - - - - - - - - - - - - - - - - - - - - -
# add to libOSILIB the appropriate ones among -lOsiCpx, -lOsiGrb, ... to
......@@ -40,7 +40,7 @@ libOSIBSCDIR = /Users/frangio/Didattica/MDGdM/Problemi/FC++/
# note: if any other solver in included, add the corresponding -lOsiXXX to
# libOSILIB (like, -lOsiCpx)
libOSILIB = -L$(libOSIBSCDIR)lib -lOsiClp -lClp -lOsi -lCoinUtils \
libOSILIB = -L$(libOSIBSCDIR)lib -lOsiClp -lOsiCpx -lClp -lOsi -lCoinUtils \
-framework Accelerate
libOSIINC = -I$(libOSIBSCDIR)include/coin
......
......@@ -54,8 +54,8 @@ MPTstSDR = $(libNDOSDR)MPTester/
include $(MPTstSDR)makefile
# OSIMPSlver
#OSIMPSDR = $(libNDOSDR)OSIMPSolver/
#include $(OSIMPSDR)makefile
OSIMPSDR = $(libNDOSDR)OSIMPSolver/
include $(OSIMPSDR)makefile
# QPPnltMP
QPPMPSDR = $(libNDOSDR)QPPnltMP/
......
......@@ -40,13 +40,13 @@ OPTUxH = $(libNDOSDR)OPTUtils/OPTUtils.h $(libNDOSDR)OPTUtils/OPTtypes.h \
$(libNDOSDR)OPTUtils/OPTvect.h
OPTUxINC = -I$(libNDOSDR)OPTUtils
# OsiSolverInterface external libreries
#include $(libNDOSDR)extlib/makefile-libOSI
#OsiSolverInterface external libreries
include $(libNDOSDR)extlib/makefile-libOSI
# cplex external libreries: need be included only if either
# OsiCpxSolverInterface has been compiled in OsiSolverInterface, or libCQK
# has been included by SubGrad and CQKnPCplex has been compiled in there
#include $(libNDOSDR)extlib/makefile-libCPX
include $(libNDOSDR)extlib/makefile-libCPX
# include the libNDO makefile requiring all external modules in input
include $(libNDOSDR)lib/makefile
......