Changeset 360:91fba31268d6 in lemon0.x for src/work/marci/edmonds_karp.h
 Timestamp:
 04/21/04 17:14:45 (17 years ago)
 Branch:
 default
 Phase:
 public
 Convert:
 svn:c9d7d8f590d60310b91f818b3a526b0e/lemon/trunk@487
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

src/work/marci/edmonds_karp.h
r330 r360 276 276 bool _augment=false; 277 277 278 BfsIterator 5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);278 BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph); 279 279 bfs.pushAndSetReached(s); 280 280 … … 340 340 ResGW res_graph(*g, *capacity, *flow); 341 341 342 BfsIterator 5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);342 BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph); 343 343 344 344 bfs.pushAndSetReached(s); … … 392 392 //computing blocking flow with dfs 393 393 394 DfsIterator 5< MG, typename MG::NodeMap<bool> > dfs(F);394 DfsIterator< MG, typename MG::NodeMap<bool> > dfs(F); 395 395 typename MG::NodeMap<typename MG::Edge> pred(F); 396 396 pred.set(sF, INVALID); … … 450 450 451 451 //bfs for distances on the residual graph 452 BfsIterator 5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);452 BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph); 453 453 bfs.pushAndSetReached(s); 454 454 typename ResGW::NodeMap<int> dist(res_graph); //filled up with 0's … … 498 498 __augment=false; 499 499 //computing blocking flow with dfs 500 DfsIterator 5< MG, typename MG::NodeMap<bool> > dfs(F);500 DfsIterator< MG, typename MG::NodeMap<bool> > dfs(F); 501 501 typename MG::NodeMap<typename MG::Edge> pred(F); 502 502 pred.set(sF, INVALID); … … 554 554 ResGW res_graph(*g, *capacity, *flow); 555 555 556 BfsIterator 5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);556 BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph); 557 557 558 558 bfs.pushAndSetReached(s); … … 594 594 __augment=false; 595 595 //computing blocking flow with dfs 596 DfsIterator 5< ErasingResGW, typename ErasingResGW::NodeMap<bool> >596 DfsIterator< ErasingResGW, typename ErasingResGW::NodeMap<bool> > 597 597 dfs(erasing_res_graph); 598 598 typename ErasingResGW::NodeMap<typename ErasingResGW::OutEdgeIt> … … 729 729 730 730 // typedef typename AugGraph::NodeMap<bool> ReachedMap; 731 // BfsIterator 5< AugGraph, /*AugOutEdgeIt,*/ ReachedMap > bfs(res_graph);731 // BfsIterator< AugGraph, /*AugOutEdgeIt,*/ ReachedMap > bfs(res_graph); 732 732 // typename AugGraph::NodeMap<AugEdge> pred(res_graph); 733 733 // for(NodeIt s=G>template first<NodeIt>(); G>valid(s); G>next(s)) { … … 919 919 920 920 // //typedef typename EAugGraph::NodeMap<bool> ReachedMap; 921 // BfsIterator 5<921 // BfsIterator< 922 922 // ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, 923 923 // /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/ … … 959 959 // //computing blocking flow with dfs 960 960 // typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap; 961 // DfsIterator 5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap >961 // DfsIterator< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap > 962 962 // dfs(res_graph); 963 963 // typename EAugGraph::NodeMap<EAugEdge> pred(res_graph, INVALID);
Note: See TracChangeset
for help on using the changeset viewer.