diff --git a/lemon/cbc.cc b/lemon/cbc.cc --- a/lemon/cbc.cc +++ b/lemon/cbc.cc @@ -25,12 +25,7 @@ #include #include -#ifdef COIN_HAS_CLP #include "coin/OsiClpSolverInterface.hpp" -#endif -#ifdef COIN_HAS_OSL -#include "coin/OsiOslSolverInterface.hpp" -#endif #include "coin/CbcCutGenerator.hpp" #include "coin/CbcHeuristicLocal.hpp" @@ -270,13 +265,7 @@ if (_osi_solver) { delete _osi_solver; } -#ifdef COIN_HAS_CLP _osi_solver = new OsiClpSolverInterface(); -#elif COIN_HAS_OSL - _osi_solver = new OsiOslSolverInterface(); -#else -#error Cannot instantiate Osi solver -#endif _osi_solver->loadFromCoinModel(*_prob); @@ -328,13 +317,11 @@ CglFlowCover flowGen; _cbc_model->addCutGenerator(&flowGen, -1, "FlowCover"); -#ifdef COIN_HAS_CLP OsiClpSolverInterface* osiclp = dynamic_cast(_cbc_model->solver()); if (osiclp->getNumRows() < 300 && osiclp->getNumCols() < 500) { osiclp->setupForRepeatedUse(2, 0); } -#endif CbcRounding heuristic1(*_cbc_model); heuristic1.setWhen(3);