Changeset 312:54e07057eb47 in lemon-0.x for src/work/marci/edmonds_karp.h
- Timestamp:
- 04/07/04 12:57:58 (21 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@430
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/work/marci/edmonds_karp.h
r311 r312 275 275 bool _augment=false; 276 276 277 typedef typename ResGW::NodeMap<bool> ReachedMap; 278 BfsIterator5< ResGW, ReachedMap > bfs(res_graph); 277 BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph); 279 278 bfs.pushAndSetReached(s); 280 279 … … 340 339 ResGW res_graph(*g, *flow, *capacity); 341 340 342 typedef typename ResGW::NodeMap<bool> ReachedMap; 343 BfsIterator5< ResGW, ReachedMap > bfs(res_graph); 341 BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph); 344 342 345 343 bfs.pushAndSetReached(s); … … 392 390 __augment=false; 393 391 //computing blocking flow with dfs 394 typedef typename TrivGraphWrapper<MG>::NodeMap<bool> BlockingReachedMap; 395 DfsIterator5< TrivGraphWrapper<MG>, BlockingReachedMap> dfs(F);392 393 DfsIterator5< MG, typename MG::NodeMap<bool> > dfs(F); 396 394 typename MG::NodeMap<typename MG::Edge> pred(F); 397 395 pred.set(sF, INVALID); … … 451 449 452 450 //bfs for distances on the residual graph 453 typedef typename ResGW::NodeMap<bool> ReachedMap; 454 BfsIterator5< ResGW, ReachedMap > bfs(res_graph); 451 BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph); 455 452 bfs.pushAndSetReached(s); 456 453 typename ResGW::NodeMap<int> dist(res_graph); //filled up with 0's … … 500 497 __augment=false; 501 498 //computing blocking flow with dfs 502 typedef typename TrivGraphWrapper<MG>::NodeMap<bool> BlockingReachedMap; 503 DfsIterator5< TrivGraphWrapper<MG>, BlockingReachedMap > dfs(F); 499 DfsIterator5< MG, typename MG::NodeMap<bool> > dfs(F); 504 500 typename MG::NodeMap<typename MG::Edge> pred(F); 505 501 pred.set(sF, INVALID); … … 557 553 ResGW res_graph(*g, *flow, *capacity); 558 554 559 typedef typename ResGW::NodeMap<bool> ReachedMap; 560 BfsIterator5< ResGW, ReachedMap > bfs(res_graph); 555 BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph); 561 556 562 557 bfs.pushAndSetReached(s); … … 598 593 __augment=false; 599 594 //computing blocking flow with dfs 600 typedef typename ErasingResGW::NodeMap<bool> BlockingReachedMap; 601 DfsIterator5< ErasingResGW, BlockingReachedMap > 595 DfsIterator5< ErasingResGW, typename ErasingResGW::NodeMap<bool> > 602 596 dfs(erasing_res_graph); 603 597 typename ErasingResGW::NodeMap<typename ErasingResGW::OutEdgeIt>
Note: See TracChangeset
for help on using the changeset viewer.