Changeset 243:a85fd87460e3 in lemon0.x for src/work/edmonds_karp.h
 Timestamp:
 03/25/04 10:42:59 (17 years ago)
 Branch:
 default
 Phase:
 public
 Convert:
 svn:c9d7d8f590d60310b91f818b3a526b0e/lemon/trunk@342
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

src/work/edmonds_karp.h
r206 r243 320 320 321 321 typedef typename AugGraph::NodeMap<bool> ReachedMap; 322 BfsIterator 4< AugGraph, AugOutEdgeIt, ReachedMap > bfs(res_graph);322 BfsIterator5< AugGraph /*, AugOutEdgeIt*/, ReachedMap > bfs(res_graph); 323 323 324 324 bfs.pushAndSetReached(s); … … 363 363 __augment=false; 364 364 //computing blocking flow with dfs 365 typedef typename MutableGraph::NodeMap<bool> BlockingReachedMap;366 DfsIterator 4< MutableGraph, typename MutableGraph::OutEdgeIt, BlockingReachedMap > dfs(F);365 typedef typename TrivGraphWrapper<MutableGraph>::NodeMap<bool> BlockingReachedMap; 366 DfsIterator5< TrivGraphWrapper<MutableGraph>/*, typename MutableGraph::OutEdgeIt*/, BlockingReachedMap > dfs(F); 367 367 typename MutableGraph::NodeMap<typename MutableGraph::Edge> pred(F); 368 368 pred.set(sF, typename MutableGraph::Edge(INVALID)); … … 421 421 //bfs for distances on the residual graph 422 422 typedef typename AugGraph::NodeMap<bool> ReachedMap; 423 BfsIterator 4< AugGraph, AugOutEdgeIt, ReachedMap > bfs(res_graph);423 BfsIterator5< AugGraph /*, AugOutEdgeIt*/, ReachedMap > bfs(res_graph); 424 424 bfs.pushAndSetReached(s); 425 425 typename AugGraph::NodeMap<int> dist(res_graph); //filled up with 0's … … 466 466 __augment=false; 467 467 //computing blocking flow with dfs 468 typedef typename MutableGraph::NodeMap<bool> BlockingReachedMap;469 DfsIterator 4< MutableGraph, typename MutableGraph::OutEdgeIt, BlockingReachedMap > dfs(F);468 typedef typename TrivGraphWrapper<MutableGraph>::NodeMap<bool> BlockingReachedMap; 469 DfsIterator5< TrivGraphWrapper<MutableGraph>/*, typename MutableGraph::OutEdgeIt*/, BlockingReachedMap > dfs(F); 470 470 typename MutableGraph::NodeMap<typename MutableGraph::Edge> pred(F); 471 471 pred.set(sF, typename MutableGraph::Edge(INVALID)); … … 528 528 529 529 //typedef typename EAugGraph::NodeMap<bool> ReachedMap; 530 BfsIterator 4<530 BfsIterator5< 531 531 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, 532 typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,532 /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/ 533 533 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph); 534 534 … … 553 553 //computing blocking flow with dfs 554 554 typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap; 555 DfsIterator 4< EAugGraph, EAugOutEdgeIt, BlockingReachedMap >555 DfsIterator5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap > 556 556 dfs(res_graph); 557 557 typename EAugGraph::NodeMap<EAugEdge> pred(res_graph); … … 855 855 856 856 //typedef typename EAugGraph::NodeMap<bool> ReachedMap; 857 BfsIterator 4<857 BfsIterator5< 858 858 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, 859 typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,859 /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/ 860 860 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph); 861 861 … … 895 895 //computing blocking flow with dfs 896 896 typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap; 897 DfsIterator 4< EAugGraph, EAugOutEdgeIt, BlockingReachedMap >897 DfsIterator5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap > 898 898 dfs(res_graph); 899 899 typename EAugGraph::NodeMap<EAugEdge> pred(res_graph, INVALID);
Note: See TracChangeset
for help on using the changeset viewer.