Changeset 1117


Ignore:
Timestamp:
Jan 9, 2009 11:30:57 AM (11 years ago)
Author:
forrest
Message:

keep going if 200 passes or more

File:
1 edited

Legend:

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

    r1116 r1117  
    433433        printf("CbcHeuristicFPump obj offset %g\n",offset);
    434434#endif
    435       solver->addRow(nel,which,els,-COIN_DBL_MAX,rhs+offset*direction);
     435      // Tweak rhs
     436      double useRhs = rhs+offset*direction;
     437#if 0
     438      double tempValue = 60.0*useRhs;
     439      if (fabs(tempValue-floor(tempValue+0.5))<1.0e-7&&rhs!=fakeCutoff_) {
     440        // add a little
     441        useRhs += 1.0e-5;
     442      }
     443#endif
     444      solver->addRow(nel,which,els,-COIN_DBL_MAX,useRhs);
    436445      delete [] which;
    437446      delete [] els;
     
    533542      if (numberIterationsPass1>=0) {
    534543        int n = totalNumberIterations - numberIterationsLastPass;
    535         if (n>CoinMax(15000,3*numberIterationsPass1)) {
     544        if (n>CoinMax(15000,3*numberIterationsPass1)&&maximumPasses_<200) {
    536545          exitAll=true;
    537546          break;
Note: See TracChangeset for help on using the changeset viewer.