Changeset 774:4297098d9677 in lemon-0.x for src/hugo/dijkstra.h

Timestamp:

08/30/04 14:01:47 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Merge back the whole branches/hugo++ to trunk.

File:

• src/hugo/dijkstra.h (modified) (4 diffs)

src/hugo/dijkstra.h

@@ -85 +85 @@
     bool local_distance;
 
+    //The source node of the last execution.
+    Node source;
+
     ///Initialize maps
     
@@ -213 +216 @@
       init_maps();
       
-      for ( NodeIt u(*G) ; G->valid(u) ; G->next(u) ) {
+      source = s;
+      
+      for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
         predecessor->set(u,INVALID);
         pred_node->set(u,INVALID);
@@ -236 +241 @@
         
         
-        for(OutEdgeIt e(*G,v); G->valid(e); G->next(e)) {
-          Node w=G->bNode(e); 
+        for(OutEdgeIt e(*G,v); e!=INVALID; ++e) {
+          Node w=G->head(e); 
           
           switch(heap.state(w)) {
@@ -311 +316 @@
 
     ///Returns \c true if \c v is reachable from the root.
-    ///\warning the root node is reported to be unreached!
-    ///\todo Is this what we want?
+    ///\warning the root node is reported to be reached!
     ///\pre \ref run() must be called before using this function.
     ///
-    bool reached(Node v) { return G->valid((*predecessor)[v]); }
+    bool reached(Node v) { return v==source || (*predecessor)[v]==INVALID; }
     
   };