Changeset 1217 for trunk/Clp


Ignore:
Timestamp:
Jun 19, 2008 6:01:30 AM (12 years ago)
Author:
forrest
Message:

fix obscure loop

File:
1 edited

Legend:

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

    r1212 r1217  
    15201520    coinFactorizationA_->setStatus(-99);
    15211521    int * pivotVariable = model->pivotVariable();
     1522    int nTimesRound=0;
    15221523    //returns 0 -okay, -1 singular, -2 too many in basis, -99 memory */
    15231524    while (coinFactorizationA_->status()<-98) {
     1525      nTimesRound++;
    15241526     
    15251527      int i;
     
    17631765          // get more memory
    17641766          coinFactorizationA_->areaFactor(2.0*coinFactorizationA_->areaFactor());
    1765         } else if (coinFactorizationA_->status()==-1&&model->numberIterations()==0&&
     1767        } else if (coinFactorizationA_->status()==-1&&
     1768                   (model->numberIterations()==0||nTimesRound>2)&&
    17661769                   coinFactorizationA_->denseThreshold()) {
    17671770          // Round again without dense
Note: See TracChangeset for help on using the changeset viewer.