Ignore:
Timestamp:
Apr 26, 2007 9:26:02 AM (13 years ago)
Author:
pbonami
Message:

Make bcp-bonmin work with new setup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/experimental/Bcp/BM.hpp

    r354 r508  
    211211
    212212#include "BCP_lp_user.hpp"
    213 #include "BonAmplInterface.hpp"
    214 #include "BonTMINLP.hpp"
     213#include "BonAmplSetup.hpp"
    215214
    216215class BM_lp : public BCP_lp_user
     
    221220
    222221    OsiBabSolver babSolver_;
    223     Bonmin::AmplInterface nlp_;
    224     Bonmin::BonminCbcParam minlpParams_;
     222    /** PIERRE: This contains the setup for running Bonmin in particular nlp solver, continuous solver,
     223      cut generators,...*/
     224    Bonmin::BonminAmplSetup bonmin_;
    225225
    226226    CoinWarmStart* ws_;
     
    233233    double cutOffDecrement_;
    234234
     235#if 0
    235236    /* A couple of cut generators to be used in the hybrid method */
    236237    CglGomory miGGen_;
     
    242243    Bonmin::OACutGenerator2 oaDec_;
    243244    Bonmin::OaFeasibilityChecker feasCheck_;
    244 
     245#endif
    245246    /* FIXME: gross cheating. works only for serial mode. Store the warmstart
    246247       informations in the lp process, do not send them over in user data or
Note: See TracChangeset for help on using the changeset viewer.