Changeset 484 for branches/devel/Cbc


Ignore:
Timestamp:
Nov 8, 2006 1:06:27 PM (13 years ago)
Author:
forrest
Message:

hopefully fix compare

Location:
branches/devel/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcCompareActual.cpp

    r439 r484  
    230230      return false;
    231231    } else {
    232       int testX = x->depth();
    233       int testY = y->depth();
    234       if (testX!=testY)
    235         return testX < testY;
     232      int depthX = x->depth();
     233      int depthY = y->depth();
     234      if (depthX!=depthY)
     235        return depthX < depthY;
    236236      else
    237237        return equalityTest(x,y); // so ties will be broken in consistent manner
    238238    }
    239239  } else {
     240    // always choose *smallest* depth if <= 7
     241    int depthX = x->depth();
     242    int depthY = y->depth();
     243    if (depthX<=7||depthY<=7) {
     244      if (depthX!=depthY) {
     245        return depthX < depthY;
     246      }
     247    }
    240248    // after solution
    241249    double weight = CoinMax(weight_,0.0);
  • branches/devel/Cbc/src/CoinSolve.cpp

    r477 r484  
    20742074                    >=10000000 for using obj
    20752075                    >=1000000 use as accumulate switch
    2076                     >=1000 use index+2 as number of large loops
     2076                    >=1000 use index+1 as number of large loops
    20772077                    >=100 use 0.05 objvalue as increment
    20782078                    >=10 use +0.1 objvalue for cutoff (add)
    20792079                    1 == fix ints at bounds, 2 fix all integral ints, 3 and continuous at bounds
    20802080                    4 and static continuous, 5 as 3 but no internal integers
     2081                    6 as 3 but all slack basis!
    20812082                  */
    20822083                  double value = babModel->solver()->getObjSense()*babModel->solver()->getObjValue();
     
    21122113                    heuristic4.setAbsoluteIncrement((0.01*i+0.005)*(fabs(value)+1.0e-12));
    21132114                    heuristic4.setAccumulate(accumulate);
    2114                     heuristic4.setMaximumRetries(r+2);
     2115                    heuristic4.setMaximumRetries(r+1);
    21152116                    if (i)
    21162117                      printf("increment of %g ",heuristic4.absoluteIncrement());
     
    21212122                  pumpTune = pumpTune%100;
    21222123                  printf("and setting when to %d\n",pumpTune+10);
     2124                  if (pumpTune==6)
     2125                    pumpTune =13;
    21232126                  heuristic4.setWhen(pumpTune+10);
    21242127                }
Note: See TracChangeset for help on using the changeset viewer.