Changeset 1745:d356e54bdafc in lemon0.x
 Timestamp:
 10/26/05 13:10:18 (16 years ago)
 Branch:
 default
 Phase:
 public
 Convert:
 svn:c9d7d8f590d60310b91f818b3a526b0e/lemon/trunk@2273
 Location:
 test
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

test/all_pairs_shortest_path_test.cc
r1732 r1745 9 9 #include <lemon/floyd_warshall.h> 10 10 #include <lemon/johnson.h> 11 12 #include <lemon/fib_heap.h> 11 13 12 14 #include <lemon/time_measure.h> … … 57 59 } 58 60 61 typedef FibHeap<Node, double, Graph::NodeMap<int> > DoubleFibHeap; 62 Johnson<Graph, LengthMap>::DefStandardHeap<DoubleFibHeap> 63 ::Create fibJohnson(graph, length); 64 { 65 Timer timer; 66 fibJohnson.run(); 67 cout << "Johnson with fibonacci heap: " << timer << endl; 68 } 69 59 70 FloydWarshall<Graph, LengthMap> floyd(graph, length); 60 71 { … … 68 79 check(johnson.connected(it, jt) == floyd.connected(it, jt), 69 80 "Wrong connection in all pairs shortest path"); 81 check(johnson.connected(it, jt) == fibJohnson.connected(it, jt), 82 "Wrong connection in all pairs shortest path"); 70 83 if (johnson.connected(it, jt)) { 71 84 check(johnson.dist(it, jt) == floyd.dist(it, jt), 85 "Wrong distance in all pairs shortest path"); 86 check(johnson.dist(it, jt) == fibJohnson.dist(it, jt), 72 87 "Wrong distance in all pairs shortest path"); 73 88 if (it != jt) { … … 75 90 johnson.dist(it, johnson.predNode(it, jt)) + 76 91 length[johnson.pred(it, jt)], 92 "Wrong edge in all pairs shortest path"); 93 check(fibJohnson.dist(it, jt) == 94 fibJohnson.dist(it, fibJohnson.predNode(it, jt)) + 95 length[fibJohnson.pred(it, jt)], 77 96 "Wrong edge in all pairs shortest path"); 78 97 check(floyd.dist(it, jt) == 
test/heap_test.h
r1728 r1745 79 79 typedef typename Graph::EdgeIt EdgeIt; 80 80 81 typename Dijkstra<Graph, LengthMap>::template Def Heap<Heap>::81 typename Dijkstra<Graph, LengthMap>::template DefStandardHeap<Heap>:: 82 82 Create dijkstra(graph, length); 83 83
Note: See TracChangeset
for help on using the changeset viewer.