COIN-OR::LEMON - Graph Library

Ignore:
Timestamp:
08/31/04 19:54:22 (16 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1070
Message:

graph_wrapper.h is ready for hugo 0.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/work/marci/lg_vs_sg_vs_sg.cc

    r762 r777  
    5454    {
    5555      std::cout << "physical blocking flow augmentation ..." << std::endl;
    56       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     56      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    5757      ts.reset();
    5858      int i=0;
     
    7676    {
    7777      std::cout << "on-the-fly blocking flow augmentation ..." << std::endl;
    78       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     78      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    7979      ts.reset();
    8080      int i=0;
     
    8787    {
    8888      std::cout << "on-the-fly shortest path augmentation ..." << std::endl;
    89       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     89      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    9090      ts.reset();
    9191      int i=0;
     
    122122    {
    123123      std::cout << "preflow ..." << std::endl;
    124       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     124      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    125125      ts.reset();
    126126      max_flow_test.run();
     
    131131    {
    132132      std::cout << "physical blocking flow augmentation ..." << std::endl;
    133       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     133      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    134134      ts.reset();
    135135      int i=0;
     
    153153    {
    154154      std::cout << "on-the-fly blocking flow augmentation ..." << std::endl;
    155       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     155      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    156156      ts.reset();
    157157      int i=0;
     
    164164    {
    165165      std::cout << "on-the-fly shortest path augmentation ..." << std::endl;
    166       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     166      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    167167      ts.reset();
    168168      int i=0;
     
    199199    {
    200200      std::cout << "preflow ..." << std::endl;
    201       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     201      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    202202      ts.reset();
    203203      max_flow_test.run();
     
    208208    {
    209209      std::cout << "physical blocking flow augmentation ..." << std::endl;
    210       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     210      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    211211      ts.reset();
    212212      int i=0;
     
    230230    {
    231231      std::cout << "on-the-fly blocking flow augmentation ..." << std::endl;
    232       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     232      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    233233      ts.reset();
    234234      int i=0;
     
    241241    {
    242242      std::cout << "on-the-fly shortest path augmentation ..." << std::endl;
    243       FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     243      for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
    244244      ts.reset();
    245245      int i=0;
Note: See TracChangeset for help on using the changeset viewer.