COIN-OR::LEMON - Graph Library

Changeset 243:a85fd87460e3 in lemon-0.x for src/work/edmonds_karp.h


Ignore:
Timestamp:
03/25/04 10:42:59 (17 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@342
Message:

.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/work/edmonds_karp.h

    r206 r243  
    320320
    321321      typedef typename AugGraph::NodeMap<bool> ReachedMap;
    322       BfsIterator4< AugGraph, AugOutEdgeIt, ReachedMap > bfs(res_graph);
     322      BfsIterator5< AugGraph /*, AugOutEdgeIt*/, ReachedMap > bfs(res_graph);
    323323
    324324      bfs.pushAndSetReached(s);
     
    363363        __augment=false;
    364364        //computing blocking flow with dfs
    365         typedef typename MutableGraph::NodeMap<bool> BlockingReachedMap;
    366         DfsIterator4< 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);
    367367        typename MutableGraph::NodeMap<typename MutableGraph::Edge> pred(F);
    368368        pred.set(sF, typename MutableGraph::Edge(INVALID));
     
    421421      //bfs for distances on the residual graph
    422422      typedef typename AugGraph::NodeMap<bool> ReachedMap;
    423       BfsIterator4< AugGraph, AugOutEdgeIt, ReachedMap > bfs(res_graph);
     423      BfsIterator5< AugGraph /*, AugOutEdgeIt*/, ReachedMap > bfs(res_graph);
    424424      bfs.pushAndSetReached(s);
    425425      typename AugGraph::NodeMap<int> dist(res_graph); //filled up with 0's
     
    466466        __augment=false;
    467467        //computing blocking flow with dfs
    468         typedef typename MutableGraph::NodeMap<bool> BlockingReachedMap;
    469         DfsIterator4< 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);
    470470        typename MutableGraph::NodeMap<typename MutableGraph::Edge> pred(F);
    471471        pred.set(sF, typename MutableGraph::Edge(INVALID));
     
    528528
    529529      //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
    530       BfsIterator4<
     530      BfsIterator5<
    531531        ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>,
    532         typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,
     532        /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/
    533533        ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph);
    534534     
     
    553553        //computing blocking flow with dfs
    554554        typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap;
    555         DfsIterator4< EAugGraph, EAugOutEdgeIt, BlockingReachedMap >
     555        DfsIterator5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap >
    556556          dfs(res_graph);
    557557        typename EAugGraph::NodeMap<EAugEdge> pred(res_graph);
     
    855855
    856856      //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
    857       BfsIterator4<
     857      BfsIterator5<
    858858        ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>,
    859         typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,
     859        /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/
    860860        ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph);
    861861
     
    895895        //computing blocking flow with dfs
    896896        typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap;
    897         DfsIterator4< EAugGraph, EAugOutEdgeIt, BlockingReachedMap >
     897        DfsIterator5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap >
    898898          dfs(res_graph);
    899899        typename EAugGraph::NodeMap<EAugEdge> pred(res_graph, INVALID);
Note: See TracChangeset for help on using the changeset viewer.