Changeset 61


Ignore:
Timestamp:
Sep 29, 2006 4:39:14 PM (13 years ago)
Author:
pbonami
Message:

Update Bcp in devel for compatibility with changes

Location:
branches/devel/Bonmin/experimental/Bcp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/experimental/Bcp/BM.cpp

    r1 r61  
    1818
    1919#include "CoinHelperFunctions.hpp"
    20 #include "BonminAmplInterface.hpp"
    21 #include "TMINLP.hpp"
     20#include "BonAmplInterface.hpp"
     21#include "BonTMINLP.hpp"
    2222#include "OsiClpSolverInterface.hpp"
    2323#include "BCP_parameters.hpp"
     
    142142                       BCP_lp_relax*& matrix)
    143143{
    144     BonminAmplInterface nlpSolver;
     144    Bonmin::AmplInterface nlpSolver;
    145145    char* argv_[3];
    146146    char** argv = argv_;
     
    232232
    233233    /* Parse again the input file so that we have a nice and clean ampl setup */
    234     BonminAmplInterface nlpSolver; 
     234    Bonmin::AmplInterface nlpSolver; 
    235235    char* argv_[3];
    236236    char** argv = argv_;
     
    470470
    471471        if (!feasChecker_) {
    472             feasChecker_ = new IpCbcOACutGenerator2(&nlp, NULL, NULL,
     472            feasChecker_ = new Bonmin::OACutGenerator2(&nlp, NULL, NULL,
    473473                                                    cutOffIncrement,
    474474                                                    integerTolerance, 0, 1);
     
    761761/*---------------------------------------------------------------------------*/
    762762
    763 void BM_lp::BmSosInfo::setFrom(const TMINLP::SosInfo * sos)
     763void BM_lp::BmSosInfo::setFrom(const Bonmin::TMINLP::SosInfo * sos)
    764764{
    765765    if (!sos || sos->num == 0)
  • branches/devel/Bonmin/experimental/Bcp/BM.hpp

    r1 r61  
    147147
    148148//#############################################################################
    149 
    150149#include <OsiAuxInfo.hpp>
    151150#include <OsiCuts.hpp>
    152151#include "BCP_lp_user.hpp"
    153 #include "IpCbcOACutGenerator2.hpp"
    154 #include "BonminAmplInterface.hpp"
     152#include "BonOACutGenerator2.hpp"
     153#include "BonAmplInterface.hpp"
    155154class BM_lp : public BCP_lp_user
    156155{
     
    165164        BmSosInfo() : num(0) {}
    166165        ~BmSosInfo();
    167         void setFrom(const TMINLP::SosInfo * sos);
     166        void setFrom(const Bonmin::TMINLP::SosInfo * sos);
    168167        void shuffle();
    169168    };
     
    174173
    175174    OsiBabSolver babSolver_;
    176     BonminAmplInterface nlp;
     175    Bonmin::AmplInterface nlp;
    177176    BmSosInfo sos;
    178177
     
    191190    double* branching_priority_;
    192191
    193     IpCbcOACutGenerator2* feasChecker_;
     192    Bonmin::OACutGenerator2* feasChecker_;
    194193    OsiCuts cuts_;
    195194
Note: See TracChangeset for help on using the changeset viewer.