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

hopefully fix compare

File:
1 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);
Note: See TracChangeset for help on using the changeset viewer.