...
 
Commits (3)
......@@ -7,18 +7,17 @@
* [B]MinQuad class [see [B]MinQuad.h and references therein]. The class
* conforms to the interface defined by the class MPSolver [see MPSolver.h].
*
* \version 0.90
* \version 0.91
*
* \date 22 - 06 - 2014
* \date 03 - 09 - 2019
*
* \author Antonio Frangioni \n
* Operations Research Group \n
* Dipartimento di Informatica \n
* Universita' di Pisa \n
*
* Copyright &copy 2001 - 2014 by Antonio Frangioni.
* Copyright &copy 2001 - 2019 by Antonio Frangioni.
*/
/*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/
/*----------------------------- DEFINITIONS --------------------------------*/
......@@ -231,6 +230,27 @@ class QPPenaltyMP : public MPSolver ,
inline void SetMaxVarRmv( cIndex MVR = 1 ) { }
#endif
/*--------------------------------------------------------------------------*/
// "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
/*--------------------------------------------------------------------------*/
inline void Sett( cHpNum tt = 1 );
......
......@@ -24,7 +24,7 @@
# internal macros - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# basic COIN directory
libOSIBSCDIR = /Users/frangio/Didattica/MDGdM/Problemi/FC++/
libOSIBSCDIR = /Users/frangio/Didattica/MDGdM/Problemi/CBC/
# macroes to be exported- - - - - - - - - - - - - - - - - - - - - - - - - - -
# add to libOSILIB the appropriate ones among -lOsiCpx, -lOsiGrb, ... to
......
......@@ -40,7 +40,7 @@ OPTUxH = $(libNDOSDR)OPTUtils/OPTUtils.h $(libNDOSDR)OPTUtils/OPTtypes.h \
$(libNDOSDR)OPTUtils/OPTvect.h
OPTUxINC = -I$(libNDOSDR)OPTUtils
#OsiSolverInterface external libreries
# OsiSolverInterface external libreries
include $(libNDOSDR)extlib/makefile-libOSI
# cplex external libreries: need be included only if either
......