Ignore:
Timestamp:
Jan 25, 2013 12:16:03 PM (6 years ago)
Author:
forrest
Message:

not a good idea - revert idea of updating best solution in small b&b for ctrl-c

File:
1 edited

Legend:

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

    r1839 r1843  
    268268    up_[0] = 0.0;
    269269    up_[1] = 0.0;
    270 #ifdef FUNNY_BRANCHING
     270#ifdef FUNNY_BRANCHING2
    271271    variables_ = NULL;
    272272    newBounds_ = NULL;
     
    285285    up_[0] = ceil(value_);
    286286    up_[1] = model->getColUpper()[iColumn];
    287 #ifdef FUNNY_BRANCHING
     287#ifdef FUNNY_BRANCHING2
    288288    variables_ = NULL;
    289289    newBounds_ = NULL;
     
    322322    up_[0] = lowerValue;
    323323    up_[1] = upperValue;
    324 #ifdef FUNNY_BRANCHING
     324#ifdef FUNNY_BRANCHING2
    325325    variables_ = NULL;
    326326    newBounds_ = NULL;
     
    337337    up_[0] = rhs.up_[0];
    338338    up_[1] = rhs.up_[1];
    339 #ifdef FUNNY_BRANCHING
     339#ifdef FUNNY_BRANCHING2
    340340    numberExtraChangedBounds_ = rhs.numberExtraChangedBounds_;
    341341    int size = numberExtraChangedBounds_ * (sizeof(double) + sizeof(int));
     
    362362        up_[0] = rhs.up_[0];
    363363        up_[1] = rhs.up_[1];
    364 #ifdef FUNNY_BRANCHING
     364#ifdef FUNNY_BRANCHING2
    365365        delete [] newBounds_;
    366366        numberExtraChangedBounds_ = rhs.numberExtraChangedBounds_;
     
    391391    // for debugging threads
    392392    way_ = -23456789;
    393 #ifdef FUNNY_BRANCHING
     393#ifdef FUNNY_BRANCHING2
    394394    delete [] newBounds_;
    395395#endif
     
    456456        printf("%d branching down has bounds %g %g", iColumn, down_[0], down_[1]);
    457457#endif
    458 #ifdef FUNNY_BRANCHING
     458#ifdef FUNNY_BRANCHING2
    459459        // branch - do extra bounds
    460460        for (int i = 0; i < numberExtraChangedBounds_; i++) {
     
    504504        printf("%d branching up has bounds %g %g", iColumn, up_[0], up_[1]);
    505505#endif
    506 #ifdef FUNNY_BRANCHING
     506#ifdef FUNNY_BRANCHING2
    507507        // branch - do extra bounds
    508508        for (int i = 0; i < numberExtraChangedBounds_; i++) {
     
    593593    return (down_[0]==up_[1]);
    594594}
    595 #ifdef FUNNY_BRANCHING
     595#ifdef FUNNY_BRANCHING2
    596596// Deactivate bounds for branching
    597597void
Note: See TracChangeset for help on using the changeset viewer.