Ignore:
Timestamp:
Mar 16, 2009 6:30:25 AM (11 years ago)
Author:
forrest
Message:

chnages to try and make faster

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcHeuristicFPump.cpp

    r1129 r1132  
    576576          maximumPasses_)
    577577        exitAll=true;
     578      bool exitThis=false;
    578579      if (iterationLimit<0.0) {
    579580        if (numberPasses>=maximumPasses_) {
    580581          // If going well then keep going if maximumPasses_ small
    581582          if (lastMove<numberPasses-4||lastMove==1000000)
    582             exitAll=true;
     583            exitThis=true;
    583584          if (maximumPasses_>20||numberPasses>=40)
    584             exitAll=true;
    585         }
    586       } else if (totalNumberIterations>iterationLimit&&numberPasses>15) {
     585            exitThis=true;
     586        }
     587      }
     588      if (iterationLimit>0.0&&totalNumberIterations>iterationLimit
     589          &&numberPasses>15) {
    587590          // exiting on iteration count
    588591        exitAll=true;
     
    593596      if (maximumTime_>0.0&&CoinCpuTime()>=startTime_+maximumTime_)
    594597        exitAll=true;
    595       if (exitAll)
     598      if (exitAll||exitThis)
    596599        break;
    597600      memcpy(newSolution,solution,numberColumns*sizeof(double));
Note: See TracChangeset for help on using the changeset viewer.