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

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.h (modified) (6 diffs)

src/work/jacint/dijkstra.h

@@ -46 +46 @@
     typename Graph::NodeMap<Edge> predecessor;
     typename Graph::NodeMap<T> distance;
+    //FIXME:
     typename Graph::NodeMap<bool> reach;
+    //typename Graph::NodeMap<int> reach;
     
   public :
@@ -66 +68 @@
       }
      
+      //FIXME:
       typename Graph::NodeMap<bool> scanned(G,false);
+      //typename Graph::NodeMap<int> scanned(G,false);
       typename Graph::NodeMap<int> heap_map(G,-1);
       
@@ -77 +81 @@
         
         Node v=heap.top(); 
-        T oldvalue=heap.get(v);
+        T oldvalue=heap[v];
         heap.pop();
         distance.set(v, oldvalue);
@@ -91 +95 @@
               heap.push(w,oldvalue+length[e]); 
               predecessor.set(w,e);
-            } else if ( oldvalue+length[e] < heap.get(w) ) {
+            } else if ( oldvalue+length[e] < heap[w] ) {
               predecessor.set(w,e);
               heap.decrease(w, oldvalue+length[e]); 
@@ -98 +102 @@
         }
       }
-    } 
+    }
     
-
     T dist(Node v) {
       return distance[v];
     }
-
 
     Edge pred(Node v) {
@@ -110 +112 @@
     }
      
-
     bool reached(Node v) {
       return reach[v];