Changeset 348


Ignore:
Timestamp:
Apr 8, 2004 4:48:53 PM (17 years ago)
Author:
forrest
Message:

New status 5

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpMessage.cpp

    r336 r348  
    1818  {CLP_SIMPLEX_STOPPED,3,1,"Stopped - objective value %g"},
    1919  {CLP_SIMPLEX_ERROR,4,1,"Stopped due to errors - objective value %g"},
    20   //{CLP_SIMPLEX_STATUS,5,1,"%d  Objective %g%? Primal infeas %g (%d)%? Dual infeas %g (%d)%? without free dual infeas (%d)"},
    21   {CLP_SIMPLEX_STATUS,5,1,"%d  Obj %g%? Primal inf %g (%d)%? Dual inf %g (%d)%? w.o. free dual inf (%d)"},
     20  {CLP_SIMPLEX_INTERRUPT,5,1,"Stopped by event handler - objective value %g"},
     21  {CLP_SIMPLEX_STATUS,6,1,"%d  Obj %g%? Primal inf %g (%d)%? Dual inf %g (%d)%? w.o. free dual inf (%d)"},
    2222  {CLP_DUAL_BOUNDS,25,3,"Looking optimal checking bounds with %g"},
    23   {CLP_SIMPLEX_ACCURACY,6,3,"Primal error %g, dual error %g"},
     23  {CLP_SIMPLEX_ACCURACY,60,3,"Primal error %g, dual error %g"},
    2424  {CLP_SIMPLEX_BADFACTOR,7,2,"Singular factorization of basis - status %d"},
    2525  {CLP_SIMPLEX_BOUNDTIGHTEN,8,3,"Bounds were tightened %d times"},
  • trunk/ClpSimplex.cpp

    r346 r348  
    50995099    if (problemStatus_==-1)
    51005100      problemStatus_=4;
    5101     assert(problemStatus_>=0&&problemStatus_<5);
     5101    assert(problemStatus_>=0&&problemStatus_<6);
    51025102    handler_->message(CLP_SIMPLEX_FINISHED+problemStatus_,messages_)
    51035103      <<objectiveValue()
  • trunk/ClpSimplexDual.cpp

    r344 r348  
    379379        int status = eventHandler_->event(ClpEventHandler::endOfValuesPass);
    380380        if (status>=0) {
    381           problemStatus_=status;
     381          problemStatus_=5;
    382382          secondaryStatus_=ClpEventHandler::endOfValuesPass;
    383383          break;
     
    388388        int status = eventHandler_->event(ClpEventHandler::endOfFactorization);
    389389        if (status>=0) {
    390           problemStatus_=status;
     390          problemStatus_=5;
    391391          secondaryStatus_=ClpEventHandler::endOfFactorization;
    392392          break;
     
    981981          int status = eventHandler_->event(ClpEventHandler::endOfIteration);
    982982          if (status>=0) {
    983             problemStatus_=status;
     983            problemStatus_=5;
    984984            secondaryStatus_=ClpEventHandler::endOfIteration;
    985985            returnCode=4;
  • trunk/ClpSimplexPrimal.cpp

    r344 r348  
    391391          int status = eventHandler_->event(ClpEventHandler::endOfValuesPass);
    392392          if (status>=0) {
    393             problemStatus_=status;
     393            problemStatus_=5;
    394394            secondaryStatus_=ClpEventHandler::endOfValuesPass;
    395395            break;
     
    401401        int status = eventHandler_->event(ClpEventHandler::endOfFactorization);
    402402        if (status>=0) {
    403           problemStatus_=status;
     403          problemStatus_=5;
    404404          secondaryStatus_=ClpEventHandler::endOfFactorization;
    405405          break;
     
    23922392      int status = eventHandler_->event(ClpEventHandler::endOfIteration);
    23932393      if (status>=0) {
    2394         problemStatus_=status;
     2394        problemStatus_=5;
    23952395        secondaryStatus_=ClpEventHandler::endOfIteration;
    23962396        returnCode=4;
  • trunk/include/ClpEventHandler.hpp

    r346 r348  
    3939  //@{
    4040  /** This can do whatever it likes.  If return code -1 then carries on
    41       if >=0 sets ClpModel::status() to that value and will return to user
     41      if 0 sets ClpModel::status() to 5 (stopped by event) and will return to user.
     42      At present if <-1 carries on and if >0 acts as if 0 - this may change
    4243  */
    4344  virtual int event(Event whichEvent);
  • trunk/include/ClpMessage.hpp

    r336 r348  
    1818  CLP_SIMPLEX_STOPPED,
    1919  CLP_SIMPLEX_ERROR,
     20  CLP_SIMPLEX_INTERRUPT,
    2021  CLP_SIMPLEX_STATUS,
    2122  CLP_DUAL_BOUNDS,
  • trunk/include/ClpModel.hpp

    r344 r348  
    239239       1 - primal infeasible
    240240       2 - dual infeasible
    241        3 - stopped on iterations etc
     241       3 - stopped on iterations or time
    242242       4 - stopped due to errors
     243       5 - stopped by event handler (virtual int ClpEventHandler::event())
    243244   */
    244245   inline int status() const            { return problemStatus_; }
Note: See TracChangeset for help on using the changeset viewer.