Changeset 1413 for stable


Ignore:
Timestamp:
Aug 11, 2009 8:52:21 AM (10 years ago)
Author:
stefan
Message:

merge bugfix from chgset 1397 in trunk into stable

Location:
stable/1.10/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.10/Clp/src/ClpModel.cpp

    r1404 r1413  
    806806      status_ = ClpCopyOfArray( rhs.status_,numberColumns_+numberRows_);
    807807      ray_ = NULL;
    808       if (problemStatus_==1&&!secondaryStatus_)
     808      if (problemStatus_==1)
    809809        ray_ = ClpCopyOfArray (rhs.ray_,numberRows_);
    810810      else if (problemStatus_==2)
     
    865865      ClpDisjointCopyN( rhs.status_,numberColumns_+numberRows_,status_);
    866866      ray_ = NULL;
    867       if (problemStatus_==1&&!secondaryStatus_)
     867      if (problemStatus_==1)
    868868        ray_ = ClpCopyOfArray (rhs.ray_,numberRows_);
    869869      else if (problemStatus_==2)
     
    32253225  delete [] columnStatus;
    32263226  ray_ = NULL;
    3227   if (problemStatus_==1&&!secondaryStatus_)
     3227  if (problemStatus_==1)
    32283228    ray_ = whichDouble (rhs->ray_,numberRows,whichRow);
    32293229  else if (problemStatus_==2)
  • stable/1.10/Clp/src/ClpModel.hpp

    r1344 r1413  
    380380   /** Secondary status of problem - may get extended
    381381       0 - none
    382        1 - primal infeasible because dual limit reached OR probably primal
    383        infeasible but can't prove it (main status 4)
     382       1 - primal infeasible because dual limit reached OR (probably primal
     383       infeasible but can't prove it  - main status was 4)
    384384       2 - scaled problem optimal - unscaled problem has primal infeasibilities
    385385       3 - scaled problem optimal - unscaled problem has dual infeasibilities
Note: See TracChangeset for help on using the changeset viewer.