... | ... |
@@ -536,49 +536,49 @@ |
536 | 536 |
/// while ( !d.emptyQueue() ) { |
537 | 537 |
/// d.processNextArc(); |
538 | 538 |
/// } |
539 | 539 |
///\endcode |
540 | 540 |
void start() |
541 | 541 |
{ |
542 | 542 |
while ( !emptyQueue() ) processNextArc(); |
543 | 543 |
} |
544 | 544 |
|
545 | 545 |
///Executes the algorithm until the given target node is reached. |
546 | 546 |
|
547 | 547 |
///Executes the algorithm until the given target node is reached. |
548 | 548 |
/// |
549 | 549 |
///This method runs the %DFS algorithm from the root node |
550 | 550 |
///in order to compute the DFS path to \c t. |
551 | 551 |
/// |
552 | 552 |
///The algorithm computes |
553 | 553 |
///- the %DFS path to \c t, |
554 | 554 |
///- the distance of \c t from the root in the %DFS tree. |
555 | 555 |
/// |
556 | 556 |
///\pre init() must be called and a root node should be |
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 |
|
564 | 564 |
///Executes the algorithm until a condition is met. |
565 | 565 |
|
566 | 566 |
///Executes the algorithm until a condition is met. |
567 | 567 |
/// |
568 | 568 |
///This method runs the %DFS algorithm from the root node |
569 | 569 |
///until an arc \c a with <tt>am[a]</tt> true is found. |
570 | 570 |
/// |
571 | 571 |
///\param am A \c bool (or convertible) arc map. The algorithm |
572 | 572 |
///will stop when it reaches an arc \c a with <tt>am[a]</tt> true. |
573 | 573 |
/// |
574 | 574 |
///\return The reached arc \c a with <tt>am[a]</tt> true or |
575 | 575 |
///\c INVALID if no such arc was found. |
576 | 576 |
/// |
577 | 577 |
///\pre init() must be called and a root node should be |
578 | 578 |
///added with addSource() before using this function. |
579 | 579 |
/// |
580 | 580 |
///\warning Contrary to \ref Bfs and \ref Dijkstra, \c am is an arc map, |
581 | 581 |
///not a node map. |
582 | 582 |
template<class ArcBoolMap> |
583 | 583 |
Arc start(const ArcBoolMap &am) |
584 | 584 |
{ |
... | ... |
@@ -1488,49 +1488,49 @@ |
1488 | 1488 |
/// \note <tt>d.start()</tt> is just a shortcut of the following code. |
1489 | 1489 |
/// \code |
1490 | 1490 |
/// while ( !d.emptyQueue() ) { |
1491 | 1491 |
/// d.processNextArc(); |
1492 | 1492 |
/// } |
1493 | 1493 |
/// \endcode |
1494 | 1494 |
void start() { |
1495 | 1495 |
while ( !emptyQueue() ) processNextArc(); |
1496 | 1496 |
} |
1497 | 1497 |
|
1498 | 1498 |
/// \brief Executes the algorithm until the given target node is reached. |
1499 | 1499 |
/// |
1500 | 1500 |
/// Executes the algorithm until the given target node is reached. |
1501 | 1501 |
/// |
1502 | 1502 |
/// This method runs the %DFS algorithm from the root node |
1503 | 1503 |
/// in order to compute the DFS path to \c t. |
1504 | 1504 |
/// |
1505 | 1505 |
/// The algorithm computes |
1506 | 1506 |
/// - the %DFS path to \c t, |
1507 | 1507 |
/// - the distance of \c t from the root in the %DFS tree. |
1508 | 1508 |
/// |
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 |
|
1516 | 1516 |
/// \brief Executes the algorithm until a condition is met. |
1517 | 1517 |
/// |
1518 | 1518 |
/// Executes the algorithm until a condition is met. |
1519 | 1519 |
/// |
1520 | 1520 |
/// This method runs the %DFS algorithm from the root node |
1521 | 1521 |
/// until an arc \c a with <tt>am[a]</tt> true is found. |
1522 | 1522 |
/// |
1523 | 1523 |
/// \param am A \c bool (or convertible) arc map. The algorithm |
1524 | 1524 |
/// will stop when it reaches an arc \c a with <tt>am[a]</tt> true. |
1525 | 1525 |
/// |
1526 | 1526 |
/// \return The reached arc \c a with <tt>am[a]</tt> true or |
1527 | 1527 |
/// \c INVALID if no such arc was found. |
1528 | 1528 |
/// |
1529 | 1529 |
/// \pre init() must be called and a root node should be added |
1530 | 1530 |
/// with addSource() before using this function. |
1531 | 1531 |
/// |
1532 | 1532 |
/// \warning Contrary to \ref Bfs and \ref Dijkstra, \c am is an arc map, |
1533 | 1533 |
/// not a node map. |
1534 | 1534 |
template <typename AM> |
1535 | 1535 |
Arc start(const AM &am) { |
1536 | 1536 |
while ( !emptyQueue() && !am[_stack[_stack_head]] ) |
... | ... |
@@ -29,49 +29,52 @@ |
29 | 29 |
using namespace lemon; |
30 | 30 |
|
31 | 31 |
char test_lgf[] = |
32 | 32 |
"@nodes\n" |
33 | 33 |
"label\n" |
34 | 34 |
"0\n" |
35 | 35 |
"1\n" |
36 | 36 |
"2\n" |
37 | 37 |
"3\n" |
38 | 38 |
"4\n" |
39 | 39 |
"5\n" |
40 | 40 |
"6\n" |
41 | 41 |
"@arcs\n" |
42 | 42 |
" label\n" |
43 | 43 |
"0 1 0\n" |
44 | 44 |
"1 2 1\n" |
45 | 45 |
"2 3 2\n" |
46 | 46 |
"1 4 3\n" |
47 | 47 |
"4 2 4\n" |
48 | 48 |
"4 5 5\n" |
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; |
58 | 61 |
typedef Dfs<Digraph> DType; |
59 | 62 |
typedef Digraph::Node Node; |
60 | 63 |
typedef Digraph::Arc Arc; |
61 | 64 |
|
62 | 65 |
Digraph G; |
63 | 66 |
Node s, t; |
64 | 67 |
Arc e; |
65 | 68 |
int l, i; |
66 | 69 |
bool b; |
67 | 70 |
DType::DistMap d(G); |
68 | 71 |
DType::PredMap p(G); |
69 | 72 |
Path<Digraph> pp; |
70 | 73 |
concepts::ReadMap<Arc,bool> am; |
71 | 74 |
|
72 | 75 |
{ |
73 | 76 |
DType dfs_test(G); |
74 | 77 |
const DType& const_dfs_test = dfs_test; |
75 | 78 |
|
76 | 79 |
dfs_test.run(s); |
77 | 80 |
dfs_test.run(s,t); |
... | ... |
@@ -158,66 +161,74 @@ |
158 | 161 |
.processedMap(concepts::WriteMap<Node,bool>()) |
159 | 162 |
.run(Node()); |
160 | 163 |
b=dfs(g) |
161 | 164 |
.predMap(concepts::ReadWriteMap<Node,Arc>()) |
162 | 165 |
.distMap(concepts::ReadWriteMap<Node,VType>()) |
163 | 166 |
.reachedMap(concepts::ReadWriteMap<Node,bool>()) |
164 | 167 |
.processedMap(concepts::WriteMap<Node,bool>()) |
165 | 168 |
.path(concepts::Path<Digraph>()) |
166 | 169 |
.dist(VType()) |
167 | 170 |
.run(Node(),Node()); |
168 | 171 |
dfs(g) |
169 | 172 |
.predMap(concepts::ReadWriteMap<Node,Arc>()) |
170 | 173 |
.distMap(concepts::ReadWriteMap<Node,VType>()) |
171 | 174 |
.reachedMap(concepts::ReadWriteMap<Node,bool>()) |
172 | 175 |
.processedMap(concepts::WriteMap<Node,bool>()) |
173 | 176 |
.run(); |
174 | 177 |
} |
175 | 178 |
|
176 | 179 |
template <class Digraph> |
177 | 180 |
void checkDfs() { |
178 | 181 |
TEMPLATE_DIGRAPH_TYPEDEFS(Digraph); |
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); |
190 | 196 |
dfs_test.run(s); |
191 | 197 |
|
192 | 198 |
Path<Digraph> p = dfs_test.path(t); |
193 | 199 |
check(p.length() == dfs_test.dist(t),"path() found a wrong path."); |
194 | 200 |
check(checkPath(G, p),"path() found a wrong path."); |
195 | 201 |
check(pathSource(G, p) == s,"path() found a wrong path."); |
196 | 202 |
check(pathTarget(G, p) == t,"path() found a wrong path."); |
197 | 203 |
|
198 | 204 |
for(NodeIt v(G); v!=INVALID; ++v) { |
199 | 205 |
if (dfs_test.reached(v)) { |
200 | 206 |
check(v==s || dfs_test.predArc(v)!=INVALID, "Wrong tree."); |
201 | 207 |
if (dfs_test.predArc(v)!=INVALID ) { |
202 | 208 |
Arc e=dfs_test.predArc(v); |
203 | 209 |
Node u=G.source(e); |
204 | 210 |
check(u==dfs_test.predNode(v),"Wrong tree."); |
205 | 211 |
check(dfs_test.dist(v) - dfs_test.dist(u) == 1, |
206 | 212 |
"Wrong distance. (" << dfs_test.dist(u) << "->" |
207 | 213 |
<< dfs_test.dist(v) << ")"); |
208 | 214 |
} |
209 | 215 |
} |
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 |
} |
216 | 227 |
} |
217 | 228 |
|
218 | 229 |
int main() |
219 | 230 |
{ |
220 | 231 |
checkDfs<ListDigraph>(); |
221 | 232 |
checkDfs<SmartDigraph>(); |
222 | 233 |
return 0; |
223 | 234 |
} |
0 comments (0 inline)