COIN-OR::LEMON - Graph Library

Changeset 951:ee581a0ecfbf in lemon-1.2 for lemon/cbc.cc


Ignore:
Timestamp:
01/06/12 16:27:06 (8 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
952:0976225b5cae, 953:b873350e6258
Phase:
public
Message:

Make CBC interface compatible with latest CBC releases

CBC now uses the CLP backend unconditionally

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/cbc.cc

    r576 r951  
    2626#include <coin/OsiSolverInterface.hpp>
    2727
    28 #ifdef COIN_HAS_CLP
    2928#include "coin/OsiClpSolverInterface.hpp"
    30 #endif
    31 #ifdef COIN_HAS_OSL
    32 #include "coin/OsiOslSolverInterface.hpp"
    33 #endif
    3429
    3530#include "coin/CbcCutGenerator.hpp"
     
    259254      delete _osi_solver;
    260255    }
    261 #ifdef COIN_HAS_CLP
    262256    _osi_solver = new OsiClpSolverInterface();
    263 #elif COIN_HAS_OSL
    264     _osi_solver = new OsiOslSolverInterface();
    265 #else
    266 #error Cannot instantiate Osi solver
    267 #endif
    268257
    269258    _osi_solver->loadFromCoinModel(*_prob);
     
    317306      _cbc_model->addCutGenerator(&flowGen, -1, "FlowCover");
    318307
    319 #ifdef COIN_HAS_CLP
    320308      OsiClpSolverInterface* osiclp =
    321309        dynamic_cast<OsiClpSolverInterface*>(_cbc_model->solver());
     
    323311        osiclp->setupForRepeatedUse(2, 0);
    324312      }
    325 #endif
    326313
    327314      CbcRounding heuristic1(*_cbc_model);
Note: See TracChangeset for help on using the changeset viewer.