COIN-OR::LEMON - Graph Library

Changeset 360:91fba31268d6 in lemon-0.x for src/work/marci/edmonds_karp.h


Ignore:
Timestamp:
04/21/04 17:14:45 (16 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@487
Message:

work/marci/bfs_iterator.h BfsIterator5 -> BfsIterator?, DfsIterator5 -> DfsIterator?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/work/marci/edmonds_karp.h

    r330 r360  
    276276      bool _augment=false;
    277277     
    278       BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
     278      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
    279279      bfs.pushAndSetReached(s);
    280280       
     
    340340      ResGW res_graph(*g, *capacity, *flow);
    341341
    342       BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
     342      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
    343343
    344344      bfs.pushAndSetReached(s);
     
    392392        //computing blocking flow with dfs
    393393
    394         DfsIterator5< MG, typename MG::NodeMap<bool> > dfs(F);
     394        DfsIterator< MG, typename MG::NodeMap<bool> > dfs(F);
    395395        typename MG::NodeMap<typename MG::Edge> pred(F);
    396396        pred.set(sF, INVALID);
     
    450450
    451451      //bfs for distances on the residual graph
    452       BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
     452      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
    453453      bfs.pushAndSetReached(s);
    454454      typename ResGW::NodeMap<int> dist(res_graph); //filled up with 0's
     
    498498        __augment=false;
    499499        //computing blocking flow with dfs
    500         DfsIterator5< MG, typename MG::NodeMap<bool> > dfs(F);
     500        DfsIterator< MG, typename MG::NodeMap<bool> > dfs(F);
    501501        typename MG::NodeMap<typename MG::Edge> pred(F);
    502502        pred.set(sF, INVALID);
     
    554554      ResGW res_graph(*g, *capacity, *flow);
    555555
    556       BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
     556      BfsIterator< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
    557557
    558558      bfs.pushAndSetReached(s);
     
    594594        __augment=false;
    595595        //computing blocking flow with dfs
    596         DfsIterator5< ErasingResGW, typename ErasingResGW::NodeMap<bool> >
     596        DfsIterator< ErasingResGW, typename ErasingResGW::NodeMap<bool> >
    597597          dfs(erasing_res_graph);
    598598        typename ErasingResGW::NodeMap<typename ErasingResGW::OutEdgeIt>
     
    729729     
    730730//       typedef typename AugGraph::NodeMap<bool> ReachedMap;
    731 //       BfsIterator5< AugGraph, /*AugOutEdgeIt,*/ ReachedMap > bfs(res_graph);
     731//       BfsIterator< AugGraph, /*AugOutEdgeIt,*/ ReachedMap > bfs(res_graph);
    732732//       typename AugGraph::NodeMap<AugEdge> pred(res_graph);
    733733//       for(NodeIt s=G->template first<NodeIt>(); G->valid(s); G->next(s)) {
     
    919919
    920920//       //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
    921 //       BfsIterator5<
     921//       BfsIterator<
    922922//      ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>,
    923923//      /*typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,*/
     
    959959//      //computing blocking flow with dfs
    960960//      typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap;
    961 //      DfsIterator5< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap >
     961//      DfsIterator< EAugGraph/*, EAugOutEdgeIt*/, BlockingReachedMap >
    962962//        dfs(res_graph);
    963963//      typename EAugGraph::NodeMap<EAugEdge> pred(res_graph, INVALID);
Note: See TracChangeset for help on using the changeset viewer.