# HG changeset patch # User Alpar Juttner # Date 1285140361 -7200 # Node ID c85f53572941cc2dd4476d6a8eff1c67dbb3d1fe # Parent d0e5734fc48ead7a6b70d9682368147934c5747e# Parent e24922c56bc2e6cef6cff65c251ce6000005d00f Merge bugfix #392 to branch 1.1 diff -r d0e5734fc48e -r c85f53572941 lemon/dfs.h --- a/lemon/dfs.h Tue Sep 21 06:28:35 2010 +0200 +++ b/lemon/dfs.h Wed Sep 22 09:26:01 2010 +0200 @@ -557,7 +557,7 @@ ///added with addSource() before using this function. void start(Node t) { - while ( !emptyQueue() && G->target(_stack[_stack_head])!=t ) + while ( !emptyQueue() && !(*_reached)[t] ) processNextArc(); } @@ -1509,7 +1509,7 @@ /// \pre init() must be called and a root node should be added /// with addSource() before using this function. void start(Node t) { - while ( !emptyQueue() && _digraph->target(_stack[_stack_head]) != t ) + while ( !emptyQueue() && !(*_reached)[t] ) processNextArc(); } diff -r d0e5734fc48e -r c85f53572941 test/dfs_test.cc --- a/test/dfs_test.cc Tue Sep 21 06:28:35 2010 +0200 +++ b/test/dfs_test.cc Wed Sep 22 09:26:01 2010 +0200 @@ -50,7 +50,10 @@ "6 3 7\n" "@attributes\n" "source 0\n" - "target 5\n"; + "target 5\n" + "source1 6\n" + "target1 3\n"; + void checkDfsCompile() { @@ -179,11 +182,14 @@ Digraph G; Node s, t; + Node s1, t1; std::istringstream input(test_lgf); digraphReader(G, input). node("source", s). node("target", t). + node("source1", s1). + node("target1", t1). run(); Dfs dfs_test(G); @@ -210,6 +216,11 @@ } { + Dfs dfs(G); + check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6."); + } + + { NullMap myPredMap; dfs(G).predMap(myPredMap).run(s); }