gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Bug fix in PairingHeap::pop() (#301)
0 2 0
default
2 files changed with 12 insertions and 10 deletions:
↑ Collapse diff ↑
Show white space 12 line context
... ...
@@ -263,12 +263,14 @@
263 263
      }
264 264

	
265 265
      if ( 0==num_child ) {
266 266
        minimum = container[minimum].child;
267 267
      }
268 268

	
269
      if (minimum >= 0) container[minimum].left_child = false;
270

	
269 271
      --num_items;
270 272
    }
271 273

	
272 274
    /// \brief Deletes \c item from the heap.
273 275
    ///
274 276
    /// This method deletes \c item from the heap, if \c item was already
Show white space 12 line context
... ...
@@ -219,22 +219,22 @@
219 219
    typedef FibHeap<Prio, IntNodeMap > NodeHeap;
220 220
    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
221 221
    dijkstraHeapTest<NodeHeap>(digraph, length, source);
222 222
  }
223 223

	
224 224
  // PairingHeap
225
//  {
226
//    typedef PairingHeap<Prio, ItemIntMap> IntHeap;
227
//    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
228
//    heapSortTest<IntHeap>();
229
//    heapIncreaseTest<IntHeap>();
230
//
231
//    typedef PairingHeap<Prio, IntNodeMap > NodeHeap;
232
//    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
233
//    dijkstraHeapTest<NodeHeap>(digraph, length, source);
234
//  }
225
  {
226
    typedef PairingHeap<Prio, ItemIntMap> IntHeap;
227
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
228
    heapSortTest<IntHeap>();
229
    heapIncreaseTest<IntHeap>();
230

	
231
    typedef PairingHeap<Prio, IntNodeMap > NodeHeap;
232
    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
233
    dijkstraHeapTest<NodeHeap>(digraph, length, source);
234
  }
235 235

	
236 236
  // RadixHeap
237 237
  {
238 238
    typedef RadixHeap<ItemIntMap> IntHeap;
239 239
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
240 240
    heapSortTest<IntHeap>();
0 comments (0 inline)