Changeset 1283:fc20371677b9 in lemon-0.x

Timestamp:

03/31/05 15:31:39 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

getPath() added to Bfs/Dfs/Dijkstra?.

Location:

src

Files:

• lemon/bfs.h (modified) (1 diff)
• lemon/dfs.h (modified) (1 diff)
• lemon/dijkstra.h (modified) (2 diffs)
• test/bfs_test.cc (modified) (3 diffs)
• test/dfs_test.cc (modified) (3 diffs)
• test/dijkstra_test.cc (modified) (3 diffs)

src/lemon/bfs.h

@@ -654 +654 @@
     ///@{
 
+    ///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.
+    ///\todo Is it the right way to handle unreachable nodes?
+    ///\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);pred(t)!=INVALID;t=predNode(t))
+          b.pushFront(pred(t));
+        b.commit();
+        return true;
+      }
+      return false;
+    }
+
     ///The distance of a node from the root(s).
 

src/lemon/dfs.h

@@ -661 +661 @@
     ///@{
 
+    ///Copies the path to \c t on the DFS tree into \c p
+    
+    ///This function copies the path on the DFS tree to \c t into \c p.
+    ///If it \c \t is a source itself or unreachable, then it does not
+    ///alter \c p.
+    ///\todo Is it the right way to handle unreachable nodes?
+    ///\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);pred(t)!=INVALID;t=predNode(t))
+          b.pushFront(pred(t));
+        b.commit();
+        return true;
+      }
+      return false;
+    }
+
     ///The distance of a node from the root(s).
 

src/lemon/dijkstra.h

@@ -21 +21 @@
 ///\file
 ///\brief Dijkstra algorithm.
+///
+///\todo getPath() should be implemented! (also for BFS and DFS)
 
 #include <lemon/list_graph.h>
@@ -656 +658 @@
     ///@{
 
+    ///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.
+    ///\todo Is it the right way to handle unreachable nodes?
+    ///\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);pred(t)!=INVALID;t=predNode(t))
+          b.pushFront(pred(t));
+        b.commit();
+        return true;
+      }
+      return false;
+    }
+          
     ///The distance of a node from the root.
 

src/test/bfs_test.cc

@@ -18 +18 @@
 #include <lemon/smart_graph.h>
 #include <lemon/bfs.h>
+#include <lemon/path.h>
 #include<lemon/concept/graph.h>
 
@@ -57 +58 @@
   b  = bfs_test.reached(n);
 
+  DirPath<Graph> pp(G);
+  bfs_test.getPath(pp,n);
 }
 
@@ -104 +107 @@
   check(bfs_test.dist(t)==3,"Bfs found a wrong path. " << bfs_test.dist(t));
 
+  DirPath<Graph> p(G);
+  check(bfs_test.getPath(p,t),"getPath() failed to set the path.");
+  check(p.length()==3,"getPath() found a wrong path.");
+  
 
   for(EdgeIt e(G); e==INVALID; ++e) {

src/test/dfs_test.cc

@@ -18 +18 @@
 #include <lemon/smart_graph.h>
 #include <lemon/dfs.h>
+#include <lemon/path.h>
 #include <lemon/concept/graph.h>
 
@@ -57 +58 @@
   b  = dfs_test.reached(n);
 
+  DirPath<Graph> pp(G);
+  dfs_test.getPath(pp,n);
 }
 
@@ -103 +106 @@
   dfs_test.run(s);  
   
+  DirPath<Graph> p(G);
+  check(dfs_test.getPath(p,t),"getPath() failed to set the path.");
+  check(p.length()==dfs_test.dist(t),"getPath() found a wrong path.");
+  
   for(NodeIt v(G); v!=INVALID; ++v) {
     check(dfs_test.reached(v),"Each node should be reached.");

src/test/dijkstra_test.cc

@@ -18 +18 @@
 #include <lemon/smart_graph.h>
 #include <lemon/dijkstra.h>
+#include <lemon/path.h>
 #include <lemon/maps.h>
 #include <lemon/concept/graph.h>
@@ -60 +61 @@
   //  pn = dijkstra_test.predNodeMap();
   b  = dijkstra_test.reached(n);
-  
+
+  DirPath<Graph> pp(G);
+  dijkstra_test.getPath(pp,n);
 }
 
@@ -115 +118 @@
 
 
+  DirPath<Graph> p(G);
+  check(dijkstra_test.getPath(p,t),"getPath() failed to set the path.");
+  check(p.length()==4,"getPath() found a wrong path.");
+  
+
   for(EdgeIt e(G); e!=INVALID; ++e) {
     Node u=G.source(e);