Changeset 2335:27aa03cd3121 in lemon-0.x for lemon/johnson.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/johnson.h (modified) (2 diffs)

lemon/johnson.h

@@ -29 +29 @@
 #include <lemon/dijkstra.h>
 #include <lemon/bellman_ford.h>
+#include <lemon/bits/path_dump.h>
 #include <lemon/bits/invalid.h>
 #include <lemon/error.h>
@@ -630 +631 @@
     ///@{
 
-    /// \brief 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 <typename Path>
-    bool getPath(Path &p, Node source, Node target) {
-      if (connected(source, target)) {
-        p.clear();
-        typename Path::Builder b(target);
-        for(b.setStartNode(target); predEdge(source, target) != INVALID;
-            target = predNode(target)) {
-          b.pushFront(predEdge(source, target));
-        }
-        b.commit();
-        return true;
-      }
-      return false;
+    typedef PredMatrixMapPath<Graph, PredMap> Path;
+
+    ///Gives back the shortest path.
+    
+    ///Gives back the shortest path.
+    ///\pre The \c t should be reachable from the \c t.
+    Path path(Node s, Node t) 
+    {
+      return Path(*graph, *_pred, s, t);
     }