Changeset 211:9222a9b8b323 in lemon-0.x for src/work/jacint/dijkstra.cc

Timestamp:

03/19/04 23:16:05 (19 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@306

Message:

updating

File:

• src/work/jacint/dijkstra.cc (modified) (6 diffs)

src/work/jacint/dijkstra.cc

@@ -2 +2 @@
 #include <fstream>
 
-#include <list_graph.hh>
-#include <dimacs.hh>
+#include <smart_graph.h>
+#include <list_graph.h>
+#include <dimacs.h>
 #include <dijkstra.h>
 #include <time_measure.h>
@@ -13 +14 @@
 
 int main(int, char **) {
-  typedef ListGraph::NodeIt NodeIt;
-  typedef ListGraph::EachNodeIt EachNodeIt;
-  typedef ListGraph::InEdgeIt InEdgeIt; 
+  typedef SmartGraph::Node Node;
+  typedef SmartGraph::NodeIt NodeIt;
+  typedef SmartGraph::InEdgeIt InEdgeIt; 
 
-  ListGraph G;
-  NodeIt s, t;
-  ListGraph::EdgeMap<int> cap(G);
+  SmartGraph G;
+  Node s, t;
+  SmartGraph::EdgeMap<int> cap(G);
   readDimacsMaxFlow(std::cin, G, s, t, cap);
 
@@ -25 +26 @@
   
   double pre_time=currTime();
-    Dijkstra<ListGraph, int, FibHeap<ListGraph::NodeIt, int, 
-    ListGraph::NodeMap<int> > > dijkstra_test(G, s, cap);
-    dijkstra_test.run();
+    Dijkstra<SmartGraph, int, FibHeap<SmartGraph::Node, int, 
+    SmartGraph::NodeMap<int> > > dijkstra_test(G, cap); 
+    dijkstra_test.run(s);
   double post_time=currTime();
     
@@ -34 +35 @@
  
   pre_time=currTime();
-  Dijkstra<ListGraph, int, BinHeap<ListGraph::NodeIt, int, 
-    ListGraph::NodeMap<int> > > dijkstra_test2(G, s, cap);
-  dijkstra_test2.run();
+  Dijkstra<SmartGraph, int, BinHeap<SmartGraph::Node, int, 
+    SmartGraph::NodeMap<int> > > dijkstra_test2(G, cap);
+  dijkstra_test2.run(s);
   post_time=currTime();
   
@@ -45 +46 @@
   int hiba_fib=0;
   int hiba_bin=0;
-  EachNodeIt u;
-  for ( G.getFirst(u) ; G.valid(u); G.next(u) ) {
+  NodeIt u;
+  for ( G.first(u) ; G.valid(u); G.next(u) ) {
     InEdgeIt e;
-    for ( G.getFirst(e,u); G.valid(e); G.next(e) ) {
-      NodeIt v=G.tail(e);
+    for ( G.first(e,u); G.valid(e); G.next(e) ) {
+      Node v=G.tail(e);
       if ( dijkstra_test.dist(u) - dijkstra_test.dist(v) > cap.get(e) )
         {
@@ -88 +89 @@
   std::cout << "Hibas elek szama a fibonaccis Dijkstraban: " 
             << hiba_fib << " a " << G.edgeNum() <<"-bol."<< std::endl;
-
+  
   std::cout << "Hibas elek szama a binarisos Dijkstraban: " 
             << hiba_bin << " a " << G.edgeNum() <<"-bol."<< std::endl;
-
+