Changeset 480 for trunk


Ignore:
Timestamp:
Nov 6, 2006 9:53:14 AM (13 years ago)
Author:
forrest
Message:

unbounded changes from devel

Location:
trunk/Cbc/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcMessage.cpp

    r310 r480  
    5252  {CBC_CUTS_STATS,31,1,"%d added rows had average density of %g"},
    5353  {CBC_STRONG_STATS,32,1,"Strong branching done %d times (%d iterations), fathomed %d nodes and fixed %d variables"},
     54  {CBC_UNBOUNDED,34,1,"The LP relaxation is unbounded!"},
    5455  {CBC_DUMMY_END,999999,0,""}
    5556};
  • trunk/Cbc/src/CbcMessage.hpp

    r279 r480  
    5757  CBC_CUTS_STATS,
    5858  CBC_STRONG_STATS,
     59  CBC_UNBOUNDED,
    5960  CBC_DUMMY_END
    6061};
  • trunk/Cbc/src/CbcModel.cpp

    r474 r480  
    678678  { handler_->message(CBC_INFEAS,messages_)<< CoinMessageEol ;
    679679    status_ = 0 ;
    680     secondaryStatus_ = 1;
     680    if (!solver_->isProvenDualInfeasible()) {
     681      handler_->message(CBC_INFEAS,messages_)<< CoinMessageEol ;
     682      secondaryStatus_ = 1;
     683    } else {
     684      handler_->message(CBC_UNBOUNDED,messages_)<< CoinMessageEol ;
     685      secondaryStatus_ = 7;
     686    }
    681687    originalContinuousObjective_ = COIN_DBL_MAX;
    682688    solverCharacteristics_ = NULL;
  • trunk/Cbc/src/CbcModel.hpp

    r437 r480  
    669669    /// Is  infeasiblity proven (or none better than cutoff)?
    670670    bool isProvenInfeasible() const;
     671    /// Was continuous solution unbounded
     672    bool isContinuousUnbounded() const;
     673    /// Was continuous solution unbounded
     674    bool isProvenDualInfeasible() const;
    671675    /// Node limit reached?
    672676    bool isNodeLimitReached() const;
Note: See TracChangeset for help on using the changeset viewer.