Ignore:
Timestamp:
Oct 9, 2003 12:12:15 PM (16 years ago)
Author:
forrest
Message:

Start of mini sprint

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/pre/ClpPrimalColumnSteepest.cpp

    r221 r222  
    340340    //printf("numels %d ratio %g wanted %d\n",numberElements,ratio,numberWanted);
    341341  }
     342  int numberElements = model_->factorization()->numberElements();
     343  int numberRows = model_->numberRows();
     344  // ratio is done on number of rows here
     345  double ratio = (double) numberElements/(double) numberRows;
    342346  if(switchType==4) {
    343347    // Still in devex mode
    344     int numberElements = model_->factorization()->numberElements();
    345     int numberRows = model_->numberRows();
    346     // ratio is done on number of rows here
    347     double ratio = (double) numberElements/(double) numberRows;
    348348    // Go to steepest if lot of iterations?
    349349    if (ratio<1.0) {
     
    368368      updates->clear();
    369369    }
    370     //if (model_->numberIterations()%1000==0)
    371     //printf("numels %d ratio %g wanted %d\n",numberElements,ratio,numberWanted);
     370    if (model_->numberIterations()%1000==0)
     371    printf("numels %d ratio %g wanted %d type x\n",numberElements,ratio,numberWanted);
    372372  }
    373373  if (switchType<4) {
     
    377377      numberWanted = max(2000,number/8);
    378378    } else {
    379       int numberElements = model_->factorization()->numberElements();
    380       double ratio = (double) numberElements/(double) model_->numberRows();
    381379      if (ratio<1.0) {
    382380        numberWanted = max(2000,number/20);
    383381      } else if (ratio<5.0) {
    384382        numberWanted = max(2000,number/10);
    385         numberWanted = max(numberWanted,numberColumns/20);
     383        numberWanted = max(numberWanted,numberColumns/40);
    386384      } else if (ratio<10.0) {
    387385        numberWanted = max(2000,number/8);
     
    397395      }
    398396    }
     397    if (model_->numberIterations()%1000==0)
     398    printf("numels %d ratio %g wanted %d type %d\n",numberElements,ratio,numberWanted,
     399    switchType);
    399400  }
    400401
     
    32493250  return numberInfeasible==0;
    32503251}
     3252/* Returns number of extra columns for sprint algorithm - 0 means off.
     3253   Also number of iterations before recompute
     3254*/
     3255int
     3256ClpPrimalColumnSteepest::numberSprintColumns(int & numberIterations) const
     3257{
     3258  return 0;
     3259}
     3260// Switch off sprint idea
     3261void
     3262ClpPrimalColumnSteepest::switchOffSprint()
     3263{
     3264}
Note: See TracChangeset for help on using the changeset viewer.