Changeset 1397 for trunk/Clp


Ignore:
Timestamp:
Jul 9, 2009 5:37:36 PM (10 years ago)
Author:
forrest
Message:

stuff for Marc and Stefan

Location:
trunk/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpModel.cpp

    r1396 r1397  
    807807      status_ = ClpCopyOfArray( rhs.status_,numberColumns_+numberRows_);
    808808      ray_ = NULL;
    809       if (problemStatus_==1&&!secondaryStatus_)
     809      if (problemStatus_==1)
    810810        ray_ = ClpCopyOfArray (rhs.ray_,numberRows_);
    811811      else if (problemStatus_==2)
     
    866866      ClpDisjointCopyN( rhs.status_,numberColumns_+numberRows_,status_);
    867867      ray_ = NULL;
    868       if (problemStatus_==1&&!secondaryStatus_)
     868      if (problemStatus_==1)
    869869        ray_ = ClpCopyOfArray (rhs.ray_,numberRows_);
    870870      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)
  • trunk/Clp/src/ClpModel.hpp

    r1376 r1397  
    381381   /** Secondary status of problem - may get extended
    382382       0 - none
    383        1 - primal infeasible because dual limit reached OR probably primal
    384        infeasible but can't prove it (main status 4)
     383       1 - primal infeasible because dual limit reached OR (probably primal
     384       infeasible but can't prove it  - main status was 4)
    385385       2 - scaled problem optimal - unscaled problem has primal infeasibilities
    386386       3 - scaled problem optimal - unscaled problem has dual infeasibilities
  • trunk/Clp/src/ClpSimplex.cpp

    r1377 r1397  
    81188118ClpSimplex::statusOfProblem(bool initial)
    81198119{
     8120  // We don't want scaling
     8121  int saveFlag = scalingFlag_;
     8122  if (!rowScale_)
     8123    scalingFlag_=0;
    81208124  bool goodMatrix=createRim(7+8+16+32);
    81218125  if (!goodMatrix) {
    81228126    problemStatus_=4;
     8127    scalingFlag_ = saveFlag;
    81238128    return false;
    81248129  }
     
    81348139      if (status<0) {
    81358140        deleteRim(-1);
     8141        scalingFlag_ = saveFlag;
    81368142        return false; // some error
    81378143      } else {
     
    81688174  CoinMemcpyN(dj_,numberColumns_,reducedCost_);
    81698175  deleteRim(-1);
     8176  scalingFlag_ = saveFlag;
    81708177  return (primalFeasible()&&dualFeasible());
    81718178}
Note: See TracChangeset for help on using the changeset viewer.