Ignore:
Timestamp:
Jun 19, 2010 9:53:18 AM (10 years ago)
Author:
pbelotti
Message:

fixing storage best solution, moving includes, small changes to FP

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/BonCouenne.cpp

    r349 r377  
    5959  try {
    6060
    61     Bab bb;
     61    Bonmin::Bab bb;
    6262    bb.setUsingCouenne (true);
    6363
     
    9999    double timeLimit = 0;
    100100    couenne.options () -> GetNumericValue ("time_limit", timeLimit, "couenne.");
    101     couenne.setDoubleParameter (BabSetupBase::MaxTime,
     101    couenne.setDoubleParameter (Bonmin::BabSetupBase::MaxTime,
    102102                                CoinMax (0., timeLimit - time_start));
    103103
     
    173173//    nlp_and_solver -> writeAmplSolFile (message, bb.bestSolution (), NULL);
    174174  }
    175   catch(TNLPSolver::UnsolvedError *E) {
     175  catch(Bonmin::TNLPSolver::UnsolvedError *E) {
    176176     E->writeDiffFiles();
    177177     E->printError(std::cerr);
     
    181181    //    const OsiSolverInterface &si1 = (algo > 0) ? nlpSolver : *model.solver();
    182182  }
    183   catch(OsiTMINLPInterface::SimpleError &E) {
     183  catch (Bonmin::OsiTMINLPInterface::SimpleError &E) {
    184184    std::cerr<<E.className()<<"::"<<E.methodName()
    185185             <<std::endl
    186186             <<E.message()<<std::endl;
    187187  }
    188   catch(CoinError &E) {
     188  catch (CoinError &E) {
    189189    std::cerr<<E.className()<<"::"<<E.methodName()
    190190             <<std::endl
Note: See TracChangeset for help on using the changeset viewer.