Commit 98ecda08 authored by Antonio Frangioni's avatar Antonio Frangioni 🤖

Merge branch 'master' of gitlab.com:frangio68/ndosolver_fioracle_project

parents bc45c273 72179ed6
......@@ -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
......@@ -208,6 +208,27 @@ class QPPenaltyMP : public MPSolver ,
void SetDim( cIndex MxBSz = 0 , FiOracle *Oracle = 0 ,
const bool UsAvSt = false );
/*--------------------------------------------------------------------------*/
// "publicize" the MinQuad::SetPricing method
using MinQuad::SetPricing;
/*--------------------------------------------------------------------------*/
#if( HV_NNVAR )
// "publicize" the BMinQuad::SetMaxVarAdd method
using BMinQuad::SetMaxVarAdd;
// "publicize" the BMinQuad::SetMaxVarRmv method
using BMinQuad::SetMaxVarRmv;
#else
// provide a dummy implementation of BMinQuad::SetMaxVarAdd
inline void SetMaxVarAdd( cIndex MVA = 1 ) { }
// provide a dummy implementation of BMinQuad::SetMaxVarRmv
inline void SetMaxVarRmv( cIndex MVR = 1 ) { }
#endif
/*--------------------------------------------------------------------------*/
// "publicize" the MinQuad::SetPricing method
......
......@@ -30,7 +30,7 @@
libCPXEXTLIB = -framework CoreFoundation -framework IOKit
# basic Cplex directory
libCPXBSCDIR = /Users/frangio/Applications/CPLEX_Studio128/cplex/
libCPXBSCDIR = /Users/frangio/Applications/CPLEX_Studio128/cplex/
# lib Cplex directory
libCPXINCDIR = $(libCPXBSCDIR)lib/x86-64_osx/static_pic/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment