Changeset 217:fc549fac0dd0 in lemon-0.x for src/work/jacint/dijkstra.cc

Timestamp:

03/20/04 17:13:19 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Several bugfixes

File:

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

src/work/jacint/dijkstra.cc

@@ -26 +26 @@
   
   double pre_time=currTime();
-    Dijkstra<SmartGraph, int, FibHeap<SmartGraph::Node, int, 
+  Dijkstra<SmartGraph, int, FibHeap<SmartGraph::Node, int, 
     SmartGraph::NodeMap<int> > > dijkstra_test(G, cap); 
-    dijkstra_test.run(s);
+  dijkstra_test.run(s);
   double post_time=currTime();
     
-  std::cout << "running time with fib_heap: " 
+    std::cout << "running time with fib_heap: " 
             << post_time-pre_time << " sec"<< std::endl; 
  
@@ -51 +51 @@
     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) )
+      if ( dijkstra_test.dist(u) - dijkstra_test.dist(v) > cap[e] )
         {
           std::cout<<"Hibas el a fibonaccis Dijkstraban: " 
                    << dijkstra_test.dist(u) - dijkstra_test.dist(v) - 
-            cap.get(e)<<std::endl;
+            cap[e]<<std::endl;
           ++hiba_fib;
         }
-      if ( dijkstra_test2.dist(u) - dijkstra_test2.dist(v) > cap.get(e) )
+      if ( dijkstra_test2.dist(u) - dijkstra_test2.dist(v) > cap[e] )
         {
           std::cout<<"Hibas el a binarisos Dijkstraban: " 
                    << dijkstra_test2.dist(u) - dijkstra_test2.dist(v) - 
-            cap.get(e)<<std::endl;
+            cap[e]<<std::endl;
           ++hiba_bin;
         }
       if ( e==dijkstra_test.pred(u) && 
-           dijkstra_test.dist(u) - dijkstra_test.dist(v) != cap.get(e) )
+           dijkstra_test.dist(u) - dijkstra_test.dist(v) != cap[e] )
         {
           std::cout<<"Hibas fael a fibonaccis Dijkstraban: "<<
-            dijkstra_test.dist(u) - dijkstra_test.dist(v)- cap.get(e)<<std::endl;
+            dijkstra_test.dist(u) - dijkstra_test.dist(v)- cap[e]<<std::endl;
           ++hiba_fib;
         }
       if ( e==dijkstra_test2.pred(u) && 
-           dijkstra_test2.dist(u) - dijkstra_test2.dist(v) != cap.get(e) )
+           dijkstra_test2.dist(u) - dijkstra_test2.dist(v) != cap[e] )
         {
           std::cout<<"Hibas fael a binarisos Dijkstraban: "<<
-            dijkstra_test2.dist(u) - dijkstra_test2.dist(v)- cap.get(e)<<std::endl;
+            dijkstra_test2.dist(u) - dijkstra_test2.dist(v)- cap[e]<<std::endl;
           ++hiba_bin;
         }