Changeset 1438


Ignore:
Timestamp:
Jun 21, 2009 6:28:02 AM (10 years ago)
Author:
pbonami
Message:

Merge r1435 into trunk

Location:
trunk/Bonmin/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/CbcBonmin/BonCbc.cpp

    r1423 r1438  
    591591    }
    592592    if (model_.status() == 0) {
     593      if(model_.isContinuousUnbounded()){
     594        status = TMINLP::CONTINUOUS_UNBOUNDED;
     595        mipStatus_ = UnboundedOrInfeasible;
     596      }
     597      else
    593598      if (bestSolution_) {
    594599        status = TMINLP::SUCCESS;
  • trunk/Bonmin/src/CbcBonmin/BonCbc.hpp

    r1254 r1438  
    2424        ProvenInfeasible /** Problem has been proven to be infeasible.*/,
    2525        Feasible /** An integer solution to the problem has been found.*/,
     26        UnboundedOrInfeasible /*Coninuous relaxation is unbounded.*/,
    2627        NoSolutionKnown/** No feasible solution to the problem is known*/};
    2728    /** Constructor.*/
  • trunk/Bonmin/src/Interfaces/Ampl/BonAmplTMINLP.cpp

    r1408 r1438  
    113113                        )
    114114  {
     115    appName_ = appName;
    115116    options->GetEnumValue("file_solution",writeAmplSolFile_,"bonmin.");
    116117    jnlst_ = jnlst;
     
    659660    if (status == TMINLP::SUCCESS) {
    660661      status_str = "\t\"Finished\"";
    661       message = "\nbonmin: Optimal";
     662      message = "\n" + appName_ +": Optimal";
    662663    }
    663664    else if (status == TMINLP::INFEASIBLE) {
    664665      status_str = "\t\"Finished\"";
    665       message = "\nbonmin: Infeasible problem";
     666      message = "\n" + appName_ + ": Infeasible problem";
    666667    }
    667668    else if (status == TMINLP::LIMIT_EXCEEDED) {
    668669      status_str = "\t\"Not finished\"";
    669       message = "\n Optimization interupted on limit.";
     670      message = "\n" + appName_ + ": Optimization interupted on limit.";
    670671    }
    671672    else if (status == TMINLP::MINLP_ERROR) {
    672673      status_str = "\t\"Aborted\"";
    673       message = "\n Error encountered in optimization.";
     674      message = "\n" + appName_ + ": Error encountered in optimization.";
    674675    }
    675676    if (writeAmplSolFile_) {
  • trunk/Bonmin/src/Interfaces/Ampl/BonAmplTMINLP.hpp

    r1408 r1438  
    269269    //@}
    270270
     271     /** Name of application.*/
     272    std::string appName_;
     273
    271274    /** Index of the objective to use for upper bounding*/
    272275    int upperBoundingObj_;
  • trunk/Bonmin/src/Interfaces/BonTMINLP.hpp

    r1088 r1438  
    6666      SUCCESS,
    6767      INFEASIBLE,
     68      CONTINUOUS_UNBOUNDED,
    6869      LIMIT_EXCEEDED,
    6970      MINLP_ERROR};
Note: See TracChangeset for help on using the changeset viewer.