Ignore:
Timestamp:
Oct 9, 2002 1:39:34 PM (18 years ago)
Author:
forrest
Message:

Presolve in as option

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel-1/Presolve.cpp

    r31 r33  
    4242  ncols_(0),
    4343  nrows_(0),
    44   nelems_(0)
     44  nelems_(0),
     45  numberPasses_(5)
    4546{
    4647}
     
    166167Presolve::presolvedModel(ClpSimplex & si,
    167168                         double feasibilityTolerance,
    168                          bool keepIntegers)
     169                         bool keepIntegers,
     170                         int numberPasses)
    169171{
    170172  ncols_ = si.getNumCols();
    171173  nrows_ = si.getNumRows();
    172174  nelems_ = si.getNumElements();
     175  numberPasses_ = numberPasses;
    173176
    174177  double maxmin = si.getObjSense();
     
    414417       
    415418
    416     int iLoop1,numberLoops1 = 10;
    417 
    418     for (iLoop1=0;iLoop1<numberLoops1;iLoop1++) {
    419       printf("Starting major pass %d\n",iLoop1+1);
     419    int iLoop;
     420
     421    for (iLoop=0;iLoop<numberPasses_;iLoop++) {
     422      printf("Starting major pass %d\n",iLoop+1);
    420423      const PresolveAction * const paction0 = paction_;
    421424      // look for substitutions with no fill
Note: See TracChangeset for help on using the changeset viewer.