equal
deleted
inserted
replaced
27 |
27 |
28 std::cout << "dijkstra demo ..." << std::endl; |
28 std::cout << "dijkstra demo ..." << std::endl; |
29 |
29 |
30 //double pre_time=currTime(); |
30 //double pre_time=currTime(); |
31 tim.reset(); |
31 tim.reset(); |
32 Dijkstra <SmartGraph, |
32 // Dijkstra <SmartGraph, |
33 SmartGraph::EdgeMap<int>, |
33 // SmartGraph::EdgeMap<int>, |
34 FibHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> > |
34 // FibHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> > |
35 > dijkstra_test(G, cap); |
35 // > dijkstra_test(G, cap); |
|
36 |
|
37 Dijkstra <SmartGraph, SmartGraph::EdgeMap<int>, FibHeap > |
|
38 dijkstra_test(G, cap); |
36 |
39 |
37 dijkstra_test.run(s); |
40 dijkstra_test.run(s); |
38 //double post_time=currTime(); |
41 //double post_time=currTime(); |
39 |
42 |
40 std::cout << "running time with fib_heap: " |
43 std::cout << "running time with fib_heap: " |
42 << tim |
45 << tim |
43 << std::endl; |
46 << std::endl; |
44 |
47 |
45 //pre_time=currTime(); |
48 //pre_time=currTime(); |
46 tim.reset(); |
49 tim.reset(); |
47 Dijkstra < SmartGraph, |
50 // Dijkstra < SmartGraph, |
48 SmartGraph::EdgeMap<int>, |
51 // SmartGraph::EdgeMap<int>, |
49 BinHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> > > |
52 // BinHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> > > |
50 dijkstra_test2(G, cap); |
53 // dijkstra_test2(G, cap); |
|
54 |
|
55 Dijkstra <SmartGraph, SmartGraph::EdgeMap<int>, BinHeap > |
|
56 dijkstra_test2(G, cap); |
51 |
57 |
52 dijkstra_test2.run(s); |
58 dijkstra_test2.run(s); |
53 //post_time=currTime(); |
59 //post_time=currTime(); |
54 |
60 |
55 std::cout << "running time with bin_heap: " |
61 std::cout << "running time with bin_heap: " |