Changeset 2335:27aa03cd3121 in lemon-0.x for lemon/dijkstra.h

Timestamp:

01/08/07 11:39:59 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

New path concept and path structures

TODO: BellmanFord::negativeCycle()

File:

• lemon/dijkstra.h (modified) (2 diffs)

lemon/dijkstra.h

@@ -28 +28 @@
 #include <lemon/list_graph.h>
 #include <lemon/bin_heap.h>
+#include <lemon/bits/path_dump.h>
 #include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
+
 
 namespace lemon {
@@ -718 +720 @@
     ///@{
 
-    ///Copies the shortest path to \c t into \c p
-    
-    ///This function copies the shortest path to \c t into \c p.
-    ///If it \c t is a source itself or unreachable, then it does not
-    ///alter \c p.
-    ///\return Returns \c true if a path to \c t was actually copied to \c p,
-    ///\c false otherwise.
-    ///\sa DirPath
-    template<class P>
-    bool getPath(P &p,Node t) 
-    {
-      if(reached(t)) {
-        p.clear();
-        typename P::Builder b(p);
-        for(b.setStartNode(t);predEdge(t)!=INVALID;t=predNode(t))
-          b.pushFront(predEdge(t));
-        b.commit();
-        return true;
-      }
-      return false;
-    }
-          
+    typedef PredMapPath<Graph, PredMap> Path;
+
+    ///Gives back the shortest path.
+    
+    ///Gives back the shortest path.
+    ///\pre The \c t should be reachable from the source.
+    Path path(Node t) 
+    {
+      return Path(*G, *_pred, t);
+    }
+
     ///The distance of a node from the root.