Ignore:
Timestamp:
Dec 12, 2013 10:40:41 AM (6 years ago)
Author:
forrest
Message:

changes for parallel and idiot

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp/src/ClpSimplexDual.cpp

    r1995 r2006  
    442442          // If getting nowhere - why not give it a kick
    443443          // does not seem to work too well - do some more work
    444           if (perturbation_ < 101 && numberIterations_ > 2 * (numberRows_ + numberColumns_)
     444          if (perturbation_ < 101 && numberIterations_ > 2 * (numberRows_ + numberColumns_) && (moreSpecialOptions_&1048576)==0
    445445                    && initialStatus != 10) {
    446446               perturb();
     
    784784               // If getting nowhere - why not give it a kick
    785785               // does not seem to work too well - do some more work
    786                if (perturbation_ < 101 && numberIterations_ > 2 * (numberRows_ + numberColumns_)
     786               if (perturbation_ < 101 && numberIterations_ > 2 * (numberRows_ + numberColumns_) && (moreSpecialOptions_&1048576)==0
    787787                         && initialStatus != 10) {
    788788                    perturb();
     
    63306330          // does not seem to work too well - do some more work
    63316331          if ((specialOptions_ & 524288) != 0 && (moreSpecialOptions_&2048) == 0 &&
    6332                     perturbation_ < 101 && numberIterations_ > 2 * (numberRows_ + numberColumns_)) {
     6332                    perturbation_ < 101 && numberIterations_ > 2 * (numberRows_ + numberColumns_) && (moreSpecialOptions_&1048576)==0) {
    63336333               perturb();
    63346334               // Can't get here if values pass
Note: See TracChangeset for help on using the changeset viewer.