Changeset 744
 Timestamp:
 Aug 10, 2007 9:53:15 PM (12 years ago)
 Location:
 branches/BSP/trunk/Cbc/src
 Files:

 4 edited
Legend:
 Unmodified
 Added
 Removed

branches/BSP/trunk/Cbc/src/CbcBranchBase.hpp
r706 r744 299 299 { return branch();} 300 300 301 using OsiBranchingObject::print ; 301 302 /** \brief Print something about branch  only if log level high 302 303 */ 
branches/BSP/trunk/Cbc/src/CbcTree.cpp
r724 r744 41 41 { 42 42 comparison_.test_ = &compare; 43 make_heap(nodes_.begin(), nodes_.end(), comparison_);43 std::make_heap(nodes_.begin(), nodes_.end(), comparison_); 44 44 } 45 45 … … 59 59 assert(x>objectiveValue()!=COIN_DBL_MAX&&x>nodeInfo()); 60 60 nodes_.push_back(x); 61 push_heap(nodes_.begin(), nodes_.end(), comparison_);61 std::push_heap(nodes_.begin(), nodes_.end(), comparison_); 62 62 } 63 63 … … 65 65 void 66 66 CbcTree::pop() { 67 pop_heap(nodes_.begin(), nodes_.end(), comparison_);67 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 68 68 nodes_.pop_back(); 69 69 } … … 89 89 #if 0 90 90 // take off 91 pop_heap(nodes_.begin(), nodes_.end(), comparison_);91 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 92 92 nodes_.pop_back(); 93 93 delete best; … … 119 119 // can pop 120 120 // take off 121 pop_heap(nodes_.begin(), nodes_.end(), comparison_);121 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 122 122 nodes_.pop_back(); 123 123 } else { … … 127 127 } else if (best) { 128 128 // take off 129 pop_heap(nodes_.begin(), nodes_.end(), comparison_);129 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 130 130 nodes_.pop_back(); 131 131 } … … 330 330 CbcTree::pop() { 331 331 #if 0 332 pop_heap(nodes_.begin(), nodes_.end(), comparison_);332 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 333 333 nodes_.pop_back(); 334 334 #else … … 362 362 #if 0 363 363 // take off 364 pop_heap(nodes_.begin(), nodes_.end(), comparison_);364 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 365 365 nodes_.pop_back(); 366 366 delete best; … … 392 392 // can pop 393 393 // take off 394 pop_heap(nodes_.begin(), nodes_.end(), comparison_);394 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 395 395 nodes_.pop_back(); 396 396 } else { … … 401 401 // take off 402 402 #if 0 403 pop_heap(nodes_.begin(), nodes_.end(), comparison_);403 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 404 404 nodes_.pop_back(); 405 405 #else 
branches/BSP/trunk/Cbc/src/CbcTree.hpp
r724 r744 3 3 #ifndef CbcTree_H 4 4 #define CbcTree_H 5 using namespace std;6 7 5 8 6 #include <vector> 
branches/BSP/trunk/Cbc/src/CbcTreeLocal.cpp
r511 r744 384 384 x>nodeInfo()>nodeNumber(),x,x>nodeInfo()); 385 385 #endif 386 push_heap(nodes_.begin(), nodes_.end(), comparison_);386 std::push_heap(nodes_.begin(), nodes_.end(), comparison_); 387 387 } 388 388 … … 390 390 void 391 391 CbcTreeLocal::pop() { 392 pop_heap(nodes_.begin(), nodes_.end(), comparison_);392 std::pop_heap(nodes_.begin(), nodes_.end(), comparison_); 393 393 nodes_.pop_back(); 394 394 } … … 660 660 nodes_.push_back(localNode_); 661 661 localNode_=localNode2; 662 make_heap(nodes_.begin(), nodes_.end(), comparison_);662 std::make_heap(nodes_.begin(), nodes_.end(), comparison_); 663 663 } 664 664 }
Note: See TracChangeset
for help on using the changeset viewer.