Changeset 2269:fb1c634fff29 in lemon-0.x
- Timestamp:
- 10/30/06 13:07:52 (18 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3027
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
demo/coloring.cc
r2207 r2269 64 64 65 65 Graph::NodeMap<int> heapMap(graph, -1); 66 BucketHeap< Node,Graph::NodeMap<int> > heap(heapMap);66 BucketHeap<Graph::NodeMap<int> > heap(heapMap); 67 67 68 68 for (NodeIt it(graph); it != INVALID; ++it) { -
lemon/bipartite_matching.h
r2263 r2269 1095 1095 /// 1096 1096 /// \sa BinHeap 1097 typedef BinHeap< typename BpUGraph::Node,Value, HeapCrossRef> Heap;1097 typedef BinHeap<Value, HeapCrossRef> Heap; 1098 1098 1099 1099 /// \brief Instantiates a Heap. -
lemon/dijkstra.h
r2263 r2269 1015 1015 ///The heap type used by the dijkstra algorithm. 1016 1016 typedef typename TR::Heap Heap; 1017 public:1017 public: 1018 1018 /// Constructor. 1019 1019 DijkstraWizard() : TR() {} -
test/all_pairs_shortest_path_test.cc
r2242 r2269 75 75 } 76 76 77 typedef FibHeap< Node,int, Graph::NodeMap<int> > IntFibHeap;77 typedef FibHeap<int, Graph::NodeMap<int> > IntFibHeap; 78 78 Johnson<Graph, LengthMap>::DefStandardHeap<IntFibHeap> 79 79 ::Create fibJohnson(graph, length); -
test/heap_test.cc
r2260 r2269 80 80 std::cerr << "Checking Bin Heap" << std::endl; 81 81 82 typedef BinHeap< Item,Prio, ItemIntMap> IntHeap;83 checkConcept<Heap< Item,Prio, ItemIntMap>, IntHeap>();82 typedef BinHeap<Prio, ItemIntMap> IntHeap; 83 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 84 84 heapSortTest<IntHeap>(100); 85 85 heapIncreaseTest<IntHeap>(100); 86 86 87 typedef FibHeap< Node,Prio, Graph::NodeMap<int> > NodeHeap;88 checkConcept<Heap< Node,Prio, Graph::NodeMap<int> >, NodeHeap>();87 typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap; 88 checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>(); 89 89 Timer timer; 90 90 dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start); … … 94 94 std::cerr << "Checking Fib Heap" << std::endl; 95 95 96 typedef FibHeap< Item,Prio, ItemIntMap> IntHeap;97 checkConcept<Heap< Item,Prio, ItemIntMap>, IntHeap>();96 typedef FibHeap<Prio, ItemIntMap> IntHeap; 97 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 98 98 heapSortTest<IntHeap>(100); 99 99 heapIncreaseTest<IntHeap>(100); 100 100 101 typedef FibHeap< Node,Prio, Graph::NodeMap<int> > NodeHeap;102 checkConcept<Heap< Node,Prio, Graph::NodeMap<int> >, NodeHeap>();101 typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap; 102 checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>(); 103 103 Timer timer; 104 104 dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start); … … 108 108 std::cerr << "Checking Radix Heap" << std::endl; 109 109 110 typedef RadixHeap<Item , ItemIntMap> IntHeap;111 checkConcept<Heap< Item,Prio, ItemIntMap>, IntHeap>();110 typedef RadixHeap<ItemIntMap> IntHeap; 111 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 112 112 heapSortTest<IntHeap>(100); 113 113 heapIncreaseTest<IntHeap>(100); 114 114 115 typedef RadixHeap< Node,Graph::NodeMap<int> > NodeHeap;116 checkConcept<Heap< Node,Prio, Graph::NodeMap<int> >, NodeHeap>();115 typedef RadixHeap<Graph::NodeMap<int> > NodeHeap; 116 checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>(); 117 117 Timer timer; 118 118 dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start); … … 123 123 std::cerr << "Checking Bucket Heap" << std::endl; 124 124 125 typedef BucketHeap<Item , ItemIntMap> IntHeap;126 checkConcept<Heap< Item,Prio, ItemIntMap>, IntHeap>();125 typedef BucketHeap<ItemIntMap> IntHeap; 126 checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 127 127 heapSortTest<IntHeap>(100); 128 128 heapIncreaseTest<IntHeap>(100); 129 129 130 typedef BucketHeap< Node,Graph::NodeMap<int> > NodeHeap;131 checkConcept<Heap< Node,Prio, Graph::NodeMap<int> >, NodeHeap>();130 typedef BucketHeap<Graph::NodeMap<int> > NodeHeap; 131 checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>(); 132 132 Timer timer; 133 133 dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start); -
test/heap_test.h
r2242 r2269 25 25 public: 26 26 typedef std::vector<int> Parent; 27 28 typedef int Key; 29 typedef int Value; 27 30 28 31 IntIntMap() : Parent() {}
Note: See TracChangeset
for help on using the changeset viewer.