... | ... |
@@ -552,33 +552,33 @@ |
552 | 552 |
|
553 | 553 |
///Executes the algorithm until the given target node is reached. |
554 | 554 |
|
555 | 555 |
///Executes the algorithm until the given target node is reached. |
556 | 556 |
/// |
557 | 557 |
///This method runs the %DFS algorithm from the root node |
558 | 558 |
///in order to compute the DFS path to \c t. |
559 | 559 |
/// |
560 | 560 |
///The algorithm computes |
561 | 561 |
///- the %DFS path to \c t, |
562 | 562 |
///- the distance of \c t from the root in the %DFS tree. |
563 | 563 |
/// |
564 | 564 |
///\pre init() must be called and a root node should be |
565 | 565 |
///added with addSource() before using this function. |
566 | 566 |
void start(Node t) |
567 | 567 |
{ |
568 |
while ( !emptyQueue() && |
|
568 |
while ( !emptyQueue() && !(*_reached)[t] ) |
|
569 | 569 |
processNextArc(); |
570 | 570 |
} |
571 | 571 |
|
572 | 572 |
///Executes the algorithm until a condition is met. |
573 | 573 |
|
574 | 574 |
///Executes the algorithm until a condition is met. |
575 | 575 |
/// |
576 | 576 |
///This method runs the %DFS algorithm from the root node |
577 | 577 |
///until an arc \c a with <tt>am[a]</tt> true is found. |
578 | 578 |
/// |
579 | 579 |
///\param am A \c bool (or convertible) arc map. The algorithm |
580 | 580 |
///will stop when it reaches an arc \c a with <tt>am[a]</tt> true. |
581 | 581 |
/// |
582 | 582 |
///\return The reached arc \c a with <tt>am[a]</tt> true or |
583 | 583 |
///\c INVALID if no such arc was found. |
584 | 584 |
/// |
... | ... |
@@ -1499,33 +1499,33 @@ |
1499 | 1499 |
} |
1500 | 1500 |
|
1501 | 1501 |
/// \brief Executes the algorithm until the given target node is reached. |
1502 | 1502 |
/// |
1503 | 1503 |
/// Executes the algorithm until the given target node is reached. |
1504 | 1504 |
/// |
1505 | 1505 |
/// This method runs the %DFS algorithm from the root node |
1506 | 1506 |
/// in order to compute the DFS path to \c t. |
1507 | 1507 |
/// |
1508 | 1508 |
/// The algorithm computes |
1509 | 1509 |
/// - the %DFS path to \c t, |
1510 | 1510 |
/// - the distance of \c t from the root in the %DFS tree. |
1511 | 1511 |
/// |
1512 | 1512 |
/// \pre init() must be called and a root node should be added |
1513 | 1513 |
/// with addSource() before using this function. |
1514 | 1514 |
void start(Node t) { |
1515 |
while ( !emptyQueue() && |
|
1515 |
while ( !emptyQueue() && !(*_reached)[t] ) |
|
1516 | 1516 |
processNextArc(); |
1517 | 1517 |
} |
1518 | 1518 |
|
1519 | 1519 |
/// \brief Executes the algorithm until a condition is met. |
1520 | 1520 |
/// |
1521 | 1521 |
/// Executes the algorithm until a condition is met. |
1522 | 1522 |
/// |
1523 | 1523 |
/// This method runs the %DFS algorithm from the root node |
1524 | 1524 |
/// until an arc \c a with <tt>am[a]</tt> true is found. |
1525 | 1525 |
/// |
1526 | 1526 |
/// \param am A \c bool (or convertible) arc map. The algorithm |
1527 | 1527 |
/// will stop when it reaches an arc \c a with <tt>am[a]</tt> true. |
1528 | 1528 |
/// |
1529 | 1529 |
/// \return The reached arc \c a with <tt>am[a]</tt> true or |
1530 | 1530 |
/// \c INVALID if no such arc was found. |
1531 | 1531 |
/// |
... | ... |
@@ -37,33 +37,36 @@ |
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; |
... | ... |
@@ -166,58 +169,66 @@ |
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)