lemon/cbc.cc
changeset 1120 ee581a0ecfbf
parent 623 745e182d0139
child 1122 0976225b5cae
child 1140 8d281761dea4
     1.1 --- a/lemon/cbc.cc	Sat Dec 24 01:15:59 2011 +0100
     1.2 +++ b/lemon/cbc.cc	Fri Jan 06 16:27:06 2012 +0100
     1.3 @@ -25,12 +25,7 @@
     1.4  #include <coin/CbcModel.hpp>
     1.5  #include <coin/OsiSolverInterface.hpp>
     1.6  
     1.7 -#ifdef COIN_HAS_CLP
     1.8  #include "coin/OsiClpSolverInterface.hpp"
     1.9 -#endif
    1.10 -#ifdef COIN_HAS_OSL
    1.11 -#include "coin/OsiOslSolverInterface.hpp"
    1.12 -#endif
    1.13  
    1.14  #include "coin/CbcCutGenerator.hpp"
    1.15  #include "coin/CbcHeuristicLocal.hpp"
    1.16 @@ -258,13 +253,7 @@
    1.17      if (_osi_solver) {
    1.18        delete _osi_solver;
    1.19      }
    1.20 -#ifdef COIN_HAS_CLP
    1.21      _osi_solver = new OsiClpSolverInterface();
    1.22 -#elif COIN_HAS_OSL
    1.23 -    _osi_solver = new OsiOslSolverInterface();
    1.24 -#else
    1.25 -#error Cannot instantiate Osi solver
    1.26 -#endif
    1.27  
    1.28      _osi_solver->loadFromCoinModel(*_prob);
    1.29  
    1.30 @@ -316,13 +305,11 @@
    1.31        CglFlowCover flowGen;
    1.32        _cbc_model->addCutGenerator(&flowGen, -1, "FlowCover");
    1.33  
    1.34 -#ifdef COIN_HAS_CLP
    1.35        OsiClpSolverInterface* osiclp =
    1.36          dynamic_cast<OsiClpSolverInterface*>(_cbc_model->solver());
    1.37        if (osiclp->getNumRows() < 300 && osiclp->getNumCols() < 500) {
    1.38          osiclp->setupForRepeatedUse(2, 0);
    1.39        }
    1.40 -#endif
    1.41  
    1.42        CbcRounding heuristic1(*_cbc_model);
    1.43        heuristic1.setWhen(3);