Changes in / [932:9f6ed854d409:933:ac5f72c48367] in lemon
 Files:

 3 added
 3 deleted
 2 edited
Legend:
 Unmodified
 Added
 Removed

lemon/Makefile.am
r888 r933 61 61 lemon/bfs.h \ 62 62 lemon/bin_heap.h \ 63 lemon/binom _heap.h \63 lemon/binomial_heap.h \ 64 64 lemon/bucket_heap.h \ 65 65 lemon/capacity_scaling.h \ … … 76 76 lemon/cycle_canceling.h \ 77 77 lemon/dfs.h \ 78 lemon/dheap.h \ 78 79 lemon/dijkstra.h \ 79 80 lemon/dim2.h \ … … 84 85 lemon/euler.h \ 85 86 lemon/fib_heap.h \ 86 lemon/fourary_heap.h \87 87 lemon/full_graph.h \ 88 88 lemon/glpk.h \ … … 94 94 lemon/hypercube_graph.h \ 95 95 lemon/karp.h \ 96 lemon/kary_heap.h \97 96 lemon/kruskal.h \ 98 97 lemon/hao_orlin.h \ … … 113 112 lemon/planarity.h \ 114 113 lemon/preflow.h \ 114 lemon/quad_heap.h \ 115 115 lemon/radix_heap.h \ 116 116 lemon/radix_sort.h \ 
test/heap_test.cc
r749 r929 31 31 32 32 #include <lemon/bin_heap.h> 33 #include <lemon/ fourary_heap.h>34 #include <lemon/ kary_heap.h>33 #include <lemon/quad_heap.h> 34 #include <lemon/dheap.h> 35 35 #include <lemon/fib_heap.h> 36 36 #include <lemon/pairing_heap.h> 37 37 #include <lemon/radix_heap.h> 38 #include <lemon/binom _heap.h>38 #include <lemon/binomial_heap.h> 39 39 #include <lemon/bucket_heap.h> 40 40 … … 186 186 } 187 187 188 // FouraryHeap189 { 190 typedef FouraryHeap<Prio, ItemIntMap> IntHeap;191 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 192 heapSortTest<IntHeap>(); 193 heapIncreaseTest<IntHeap>(); 194 195 typedef FouraryHeap<Prio, IntNodeMap > NodeHeap;196 checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>(); 197 dijkstraHeapTest<NodeHeap>(digraph, length, source); 198 } 199 200 // KaryHeap201 { 202 typedef KaryHeap<Prio, ItemIntMap> IntHeap;203 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 204 heapSortTest<IntHeap>(); 205 heapIncreaseTest<IntHeap>(); 206 207 typedef KaryHeap<Prio, IntNodeMap > NodeHeap;188 // QuadHeap 189 { 190 typedef QuadHeap<Prio, ItemIntMap> IntHeap; 191 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 192 heapSortTest<IntHeap>(); 193 heapIncreaseTest<IntHeap>(); 194 195 typedef QuadHeap<Prio, IntNodeMap > NodeHeap; 196 checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>(); 197 dijkstraHeapTest<NodeHeap>(digraph, length, source); 198 } 199 200 // DHeap 201 { 202 typedef DHeap<Prio, ItemIntMap> IntHeap; 203 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 204 heapSortTest<IntHeap>(); 205 heapIncreaseTest<IntHeap>(); 206 207 typedef DHeap<Prio, IntNodeMap > NodeHeap; 208 208 checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>(); 209 209 dijkstraHeapTest<NodeHeap>(digraph, length, source); … … 246 246 } 247 247 248 // Binom Heap249 { 250 typedef Binom Heap<Prio, ItemIntMap> IntHeap;251 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 252 heapSortTest<IntHeap>(); 253 heapIncreaseTest<IntHeap>(); 254 255 typedef Binom Heap<Prio, IntNodeMap > NodeHeap;248 // BinomialHeap 249 { 250 typedef BinomialHeap<Prio, ItemIntMap> IntHeap; 251 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 252 heapSortTest<IntHeap>(); 253 heapIncreaseTest<IntHeap>(); 254 255 typedef BinomialHeap<Prio, IntNodeMap > NodeHeap; 256 256 checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>(); 257 257 dijkstraHeapTest<NodeHeap>(digraph, length, source);
Note: See TracChangeset
for help on using the changeset viewer.