| ... | ... |
@@ -557,7 +557,7 @@ |
| 557 | 557 |
///added with addSource() before using this function. |
| 558 | 558 |
void start(Node t) |
| 559 | 559 |
{
|
| 560 |
while ( !emptyQueue() && |
|
| 560 |
while ( !emptyQueue() && !(*_reached)[t] ) |
|
| 561 | 561 |
processNextArc(); |
| 562 | 562 |
} |
| 563 | 563 |
|
| ... | ... |
@@ -1509,7 +1509,7 @@ |
| 1509 | 1509 |
/// \pre init() must be called and a root node should be added |
| 1510 | 1510 |
/// with addSource() before using this function. |
| 1511 | 1511 |
void start(Node t) {
|
| 1512 |
while ( !emptyQueue() && |
|
| 1512 |
while ( !emptyQueue() && !(*_reached)[t] ) |
|
| 1513 | 1513 |
processNextArc(); |
| 1514 | 1514 |
} |
| 1515 | 1515 |
| ... | ... |
@@ -50,7 +50,10 @@ |
| 50 | 50 |
"6 3 7\n" |
| 51 | 51 |
"@attributes\n" |
| 52 | 52 |
"source 0\n" |
| 53 |
"target 5\n" |
|
| 53 |
"target 5\n" |
|
| 54 |
"source1 6\n" |
|
| 55 |
"target1 3\n"; |
|
| 56 |
|
|
| 54 | 57 |
|
| 55 | 58 |
void checkDfsCompile() |
| 56 | 59 |
{
|
| ... | ... |
@@ -179,11 +182,14 @@ |
| 179 | 182 |
|
| 180 | 183 |
Digraph G; |
| 181 | 184 |
Node s, t; |
| 185 |
Node s1, t1; |
|
| 182 | 186 |
|
| 183 | 187 |
std::istringstream input(test_lgf); |
| 184 | 188 |
digraphReader(G, input). |
| 185 | 189 |
node("source", s).
|
| 186 | 190 |
node("target", t).
|
| 191 |
node("source1", s1).
|
|
| 192 |
node("target1", t1).
|
|
| 187 | 193 |
run(); |
| 188 | 194 |
|
| 189 | 195 |
Dfs<Digraph> dfs_test(G); |
| ... | ... |
@@ -210,6 +216,11 @@ |
| 210 | 216 |
} |
| 211 | 217 |
|
| 212 | 218 |
{
|
| 219 |
Dfs<Digraph> dfs(G); |
|
| 220 |
check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6."); |
|
| 221 |
} |
|
| 222 |
|
|
| 223 |
{
|
|
| 213 | 224 |
NullMap<Node,Arc> myPredMap; |
| 214 | 225 |
dfs(G).predMap(myPredMap).run(s); |
| 215 | 226 |
} |
0 comments (0 inline)