Changeset 488


Ignore:
Timestamp:
Oct 26, 2004 10:01:08 AM (15 years ago)
Author:
forrest
Message:

omissions pointed out by Marc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSimplex.cpp

    r483 r488  
    34623462    int dummy;
    34633463    if ((matrix_->generalExpanded(this,4,dummy)&1)!=0)
    3464       returnCode = ((ClpSimplexPrimal *) this)->primal(1);
     3464      returnCode = ((ClpSimplexPrimal *) this)->primal(1,startFinishOptions);
    34653465    else
    3466       returnCode = ((ClpSimplexDual *) this)->dual(0);
     3466      returnCode = ((ClpSimplexDual *) this)->dual(0,startFinishOptions);
    34673467    if (problemStatus_==3&&numberIterations_<saveMax) {
    34683468      printf("looks like trouble - too many iterations in clean up - trying again\n");
     
    35513551      // upperOut_ has largest away from bound
    35523552      dualBound_=CoinMin(2.0*upperOut_,dualBound_);
    3553       returnCode = ((ClpSimplexDual *) this)->dual(0);
     3553      returnCode = ((ClpSimplexDual *) this)->dual(0,startFinishOptions);
    35543554      dualBound_=saveBound;
    35553555    } else {
    3556       returnCode = ((ClpSimplexPrimal *) this)->primal(0);
     3556      returnCode = ((ClpSimplexPrimal *) this)->primal(0,startFinishOptions);
    35573557    }
    35583558    setInitialDenseFactorization(denseFactorization);
Note: See TracChangeset for help on using the changeset viewer.