COIN-OR::LEMON - Graph Library

Changeset 312:54e07057eb47 in lemon-0.x for src/work/marci/edmonds_karp.h


Ignore:
Timestamp:
04/07/04 12:57:58 (18 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@430
Message:

gw

File:
1 edited

Legend:

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

    r311 r312  
    275275      bool _augment=false;
    276276     
    277       typedef typename ResGW::NodeMap<bool> ReachedMap;
    278       BfsIterator5< ResGW, ReachedMap > bfs(res_graph);
     277      BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
    279278      bfs.pushAndSetReached(s);
    280279       
     
    340339      ResGW res_graph(*g, *flow, *capacity);
    341340
    342       typedef typename ResGW::NodeMap<bool> ReachedMap;
    343       BfsIterator5< ResGW, ReachedMap > bfs(res_graph);
     341      BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
    344342
    345343      bfs.pushAndSetReached(s);
     
    392390        __augment=false;
    393391        //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);
    396394        typename MG::NodeMap<typename MG::Edge> pred(F);
    397395        pred.set(sF, INVALID);
     
    451449
    452450      //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);
    455452      bfs.pushAndSetReached(s);
    456453      typename ResGW::NodeMap<int> dist(res_graph); //filled up with 0's
     
    500497        __augment=false;
    501498        //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);
    504500        typename MG::NodeMap<typename MG::Edge> pred(F);
    505501        pred.set(sF, INVALID);
     
    557553      ResGW res_graph(*g, *flow, *capacity);
    558554
    559       typedef typename ResGW::NodeMap<bool> ReachedMap;
    560       BfsIterator5< ResGW, ReachedMap > bfs(res_graph);
     555      BfsIterator5< ResGW, typename ResGW::NodeMap<bool> > bfs(res_graph);
    561556
    562557      bfs.pushAndSetReached(s);
     
    598593        __augment=false;
    599594        //computing blocking flow with dfs
    600         typedef typename ErasingResGW::NodeMap<bool> BlockingReachedMap;
    601         DfsIterator5< ErasingResGW, BlockingReachedMap >
     595        DfsIterator5< ErasingResGW, typename ErasingResGW::NodeMap<bool> >
    602596          dfs(erasing_res_graph);
    603597        typename ErasingResGW::NodeMap<typename ErasingResGW::OutEdgeIt>
Note: See TracChangeset for help on using the changeset viewer.