| ... | ... |
@@ -557,9 +557,9 @@ |
| 557 | 557 |
///\pre init() must be called and a root node should be |
| 558 | 558 |
///added with addSource() before using this function. |
| 559 | 559 |
void start(Node t) |
| 560 | 560 |
{
|
| 561 |
while ( !emptyQueue() && |
|
| 561 |
while ( !emptyQueue() && !(*_reached)[t] ) |
|
| 562 | 562 |
processNextArc(); |
| 563 | 563 |
} |
| 564 | 564 |
|
| 565 | 565 |
///Executes the algorithm until a condition is met. |
| ... | ... |
@@ -1510,9 +1510,9 @@ |
| 1510 | 1510 |
/// |
| 1511 | 1511 |
/// \pre init() must be called and a root node should be added |
| 1512 | 1512 |
/// with addSource() before using this function. |
| 1513 | 1513 |
void start(Node t) {
|
| 1514 |
while ( !emptyQueue() && |
|
| 1514 |
while ( !emptyQueue() && !(*_reached)[t] ) |
|
| 1515 | 1515 |
processNextArc(); |
| 1516 | 1516 |
} |
| 1517 | 1517 |
|
| 1518 | 1518 |
/// \brief Executes the algorithm until a condition is met. |
| ... | ... |
@@ -49,9 +49,12 @@ |
| 49 | 49 |
"5 0 6\n" |
| 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 |
{
|
| 57 | 60 |
typedef concepts::Digraph Digraph; |
| ... | ... |
@@ -143,13 +146,16 @@ |
| 143 | 146 |
TEMPLATE_DIGRAPH_TYPEDEFS(Digraph); |
| 144 | 147 |
|
| 145 | 148 |
Digraph G; |
| 146 | 149 |
Node s, t; |
| 150 |
Node s1, t1; |
|
| 147 | 151 |
|
| 148 | 152 |
std::istringstream input(test_lgf); |
| 149 | 153 |
digraphReader(G, input). |
| 150 | 154 |
node("source", s).
|
| 151 | 155 |
node("target", t).
|
| 156 |
node("source1", s1).
|
|
| 157 |
node("target1", t1).
|
|
| 152 | 158 |
run(); |
| 153 | 159 |
|
| 154 | 160 |
Dfs<Digraph> dfs_test(G); |
| 155 | 161 |
dfs_test.run(s); |
| ... | ... |
@@ -174,8 +180,13 @@ |
| 174 | 180 |
} |
| 175 | 181 |
} |
| 176 | 182 |
|
| 177 | 183 |
{
|
| 184 |
Dfs<Digraph> dfs(G); |
|
| 185 |
check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6."); |
|
| 186 |
} |
|
| 187 |
|
|
| 188 |
{
|
|
| 178 | 189 |
NullMap<Node,Arc> myPredMap; |
| 179 | 190 |
dfs(G).predMap(myPredMap).run(s); |
| 180 | 191 |
} |
| 181 | 192 |
} |
0 comments (0 inline)