Changeset 317:6e6db1c49bc1 in lemon0.x for src/work/marci/edmonds_karp.h
 Timestamp:
 04/13/04 22:35:47 (17 years ago)
 Branch:
 default
 Phase:
 public
 Convert:
 svn:c9d7d8f590d60310b91f818b3a526b0e/lemon/trunk@435
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

src/work/marci/edmonds_karp.h
r312 r317 600 600 //invalid iterators for sources 601 601 602 typename ErasingResGW::NodeMap<Number> free(erasing_res_graph); 603 604 dfs.pushAndSetReached(s); 602 typename ErasingResGW::NodeMap<Number> free1(erasing_res_graph); 603 604 dfs.pushAndSetReached( 605 typename ErasingResGW::Node( 606 typename FilterResGW::Node( 607 typename ResGW::Node(s) 608 ) 609 ) 610 ); 605 611 while (!dfs.finished()) { 606 612 ++dfs; 607 613 if (erasing_res_graph.valid( 608 /*typename ErasingResGW::OutEdgeIt*/(dfs)))614 typename ErasingResGW::OutEdgeIt(dfs))) 609 615 { 610 616 if (dfs.isBNodeNewlyReached()) { … … 615 621 pred.set(w, /*typename ErasingResGW::OutEdgeIt*/(dfs)); 616 622 if (erasing_res_graph.valid(pred[v])) { 617 free.set(w, std::min(free[v], res_graph.resCap(dfs))); 623 free1.set(w, std::min(free1[v], res_graph.resCap( 624 typename ErasingResGW::OutEdgeIt(dfs)))); 618 625 } else { 619 free.set(w, res_graph.resCap(dfs)); 626 free1.set(w, res_graph.resCap( 627 typename ErasingResGW::OutEdgeIt(dfs))); 620 628 } 621 629 … … 632 640 633 641 if (__augment) { 634 typename ErasingResGW::Node n=t; 635 Number augment_value=free[n]; 642 typename ErasingResGW::Node n=typename FilterResGW::Node(typename ResGW::Node(t)); 643 // typename ResGW::NodeMap<Number> a(res_graph); 644 // typename ResGW::Node b; 645 // Number j=a[b]; 646 // typename FilterResGW::NodeMap<Number> a1(filter_res_graph); 647 // typename FilterResGW::Node b1; 648 // Number j1=a1[b1]; 649 // typename ErasingResGW::NodeMap<Number> a2(erasing_res_graph); 650 // typename ErasingResGW::Node b2; 651 // Number j2=a2[b2]; 652 Number augment_value=free1[n]; 636 653 while (erasing_res_graph.valid(pred[n])) { 637 654 typename ErasingResGW::OutEdgeIt e=pred[n];
Note: See TracChangeset
for help on using the changeset viewer.