Changeset 1641 for trunk/Clp


Ignore:
Timestamp:
Dec 1, 2010 11:17:30 AM (9 years ago)
Author:
forrest
Message:

allow for network bobble and lightweight presolve

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1635 r1641  
    510510          int lastDropped = 0;
    511511          prob->pass_ = 0;
     512          if (numberPasses_<=5)
     513              prob->presolveOptions_ |= 0x10000; // say more lightweight
    512514          for (iLoop = 0; iLoop < numberPasses_; iLoop++) {
    513515               // See if we want statistics
     
    771773          }
    772774     }
     775     prob->presolveOptions_ &= ~0x10000;
    773776     if (!prob->status_) {
    774777          paction_ = drop_zero_coefficients(prob, paction_);
  • trunk/Clp/src/ClpSimplex.cpp

    r1613 r1641  
    52545254          // check which algorithms allowed
    52555255          int dummy;
    5256           if (problemStatus_ == 10 && saveObjective == objective_)
     5256          ClpPackedMatrix * ordinary =
     5257            dynamic_cast< ClpPackedMatrix*>(matrix_);
     5258          if (problemStatus_ == 10 && saveObjective == objective_ &&
     5259              ordinary)
    52575260               startFinishOptions |= 2;
    52585261          baseIteration_ = numberIterations_;
Note: See TracChangeset for help on using the changeset viewer.