Ignore:
Timestamp:
Jun 26, 2007 5:59:58 AM (12 years ago)
Author:
forrest
Message:

update branches/devel for threads

File:
1 edited

Legend:

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

    r439 r642  
    5151void
    5252CbcTree::push(CbcNode * x) {
     53  /*printf("push obj %g, refcount %d, left %d, pointing to %d\n",
     54         x->objectiveValue(),x->nodeInfo()->decrement(0),
     55         x->nodeInfo()->numberBranchesLeft(),x->nodeInfo()->numberPointingToThis());*/
    5356  assert(x->objectiveValue()!=COIN_DBL_MAX&&x->nodeInfo());
    5457  nodes_.push_back(x);
     
    8184      assert (best->nodeInfo()->numberBranchesLeft());
    8285    if (!best||best->objectiveValue()>=cutoff) {
     86#if 0
    8387      // take off
    8488      pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    8589      nodes_.pop_back();
     90      delete best;
    8691      best=NULL;
     92#else
     93      // let code get rid of it
     94      assert (best);
     95#endif
    8796    }
    8897  }
Note: See TracChangeset for help on using the changeset viewer.