Ignore:
Timestamp:
Dec 10, 2009 7:29:38 PM (10 years ago)
Author:
lou
Message:

Mark #if 0 with JJF_ZERO and #if 1 with JJF_ONE as a historical reference
point.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/CbcTree.cpp

    r1342 r1393  
    239239        }
    240240        if (!best || best->objectiveValue() >= cutoff) {
    241 #if 0
     241#ifdef JJF_ZERO
    242242            // take off
    243243            std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     
    463463}
    464464
    465 #if 0 // not used, referenced removed in CbcModel.cpp
     465#ifdef JJF_ZERO // not used, referenced removed in CbcModel.cpp
    466466CbcTreeArray::CbcTreeArray()
    467467        : CbcTree(),
     
    869869       x->nodeInfo()->numberBranchesLeft(),x->nodeInfo()->numberPointingToThis());*/
    870870    assert(x->objectiveValue() != COIN_DBL_MAX && x->nodeInfo());
    871 #if 0
     871#ifdef JJF_ZERO
    872872    nodes_.push_back(x);
    873873    push_heap(nodes_.begin(), nodes_.end(), comparison_);
     
    881881CbcTree::pop()
    882882{
    883 #if 0
     883#ifdef JJF_ZERO
    884884    std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    885885    nodes_.pop_back();
     
    916916        }
    917917        if (!best || best->objectiveValue() >= cutoff) {
    918 #if 0
     918#ifdef JJF_ZERO
    919919            // take off
    920920            std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     
    956956    } else if (best) {
    957957        // take off
    958 #if 0
     958#ifdef JJF_ZERO
    959959        std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    960960        nodes_.pop_back();
Note: See TracChangeset for help on using the changeset viewer.