src/work/marci/experiment/edmonds_karp_demo.cc
changeset 986 e997802b855c
parent 921 818510fa3d99
     1.1 --- a/src/work/marci/experiment/edmonds_karp_demo.cc	Sat Nov 13 12:24:01 2004 +0000
     1.2 +++ b/src/work/marci/experiment/edmonds_karp_demo.cc	Sat Nov 13 12:53:28 2004 +0000
     1.3 @@ -104,7 +104,7 @@
     1.4      int i=0;
     1.5      while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) { 
     1.6  //     for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) { 
     1.7 -//       std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
     1.8 +//       std::cout<<"("<<G.source(e)<< "-"<<flow.get(e)<<"->"<<G.target(e)<<") ";
     1.9  //     }
    1.10  //     std::cout<<std::endl;
    1.11        ++i; 
    1.12 @@ -112,7 +112,7 @@
    1.13  
    1.14  //   std::cout << "maximum flow: "<< std::endl;
    1.15  //   for(EdgeIt e=G.first<EdgeIt>(); e.valid(); ++e) { 
    1.16 -//     std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
    1.17 +//     std::cout<<"("<<G.source(e)<< "-"<<flow.get(e)<<"->"<<G.target(e)<<") ";
    1.18  //   }
    1.19  //   std::cout<<std::endl;
    1.20      std::cout << "elapsed time: " << ts << std::endl;
    1.21 @@ -135,7 +135,7 @@
    1.22      int i=0;
    1.23      while (max_flow_test.augmentOnBlockingFlow1<MutableGraph>()) { 
    1.24  //     for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) { 
    1.25 -//       std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
    1.26 +//       std::cout<<"("<<G.source(e)<< "-"<<flow.get(e)<<"->"<<G.target(e)<<") ";
    1.27  //     }
    1.28  //     std::cout<<std::endl;
    1.29        ++i; 
    1.30 @@ -143,7 +143,7 @@
    1.31  
    1.32  //   std::cout << "maximum flow: "<< std::endl;
    1.33  //   for(EdgeIt e=G.first<EdgeIt>(); e.valid(); ++e) { 
    1.34 -//     std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
    1.35 +//     std::cout<<"("<<G.source(e)<< "-"<<flow.get(e)<<"->"<<G.target(e)<<") ";
    1.36  //   }
    1.37  //   std::cout<<std::endl;
    1.38      std::cout << "elapsed time: " << ts << std::endl;
    1.39 @@ -166,7 +166,7 @@
    1.40      int i=0;
    1.41      while (max_flow_test.augmentOnBlockingFlow2()) { 
    1.42  //     for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) { 
    1.43 -//       std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
    1.44 +//       std::cout<<"("<<G.source(e)<< "-"<<flow.get(e)<<"->"<<G.target(e)<<") ";
    1.45  //     }
    1.46  //     std::cout<<std::endl;
    1.47        ++i; 
    1.48 @@ -174,7 +174,7 @@
    1.49  
    1.50  //   std::cout << "maximum flow: "<< std::endl;
    1.51  //   for(EdgeIt e=G.first<EdgeIt>(); e.valid(); ++e) { 
    1.52 -//     std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
    1.53 +//     std::cout<<"("<<G.source(e)<< "-"<<flow.get(e)<<"->"<<G.target(e)<<") ";
    1.54  //   }
    1.55  //   std::cout<<std::endl;
    1.56      std::cout << "elapsed time: " << ts << std::endl;
    1.57 @@ -197,7 +197,7 @@
    1.58      int i=0;
    1.59      while (max_flow_test.augmentOnShortestPath()) { 
    1.60  //     for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) { 
    1.61 -//       std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
    1.62 +//       std::cout<<"("<<G.source(e)<< "-"<<flow.get(e)<<"->"<<G.target(e)<<") ";
    1.63  //     }
    1.64  //     std::cout<<std::endl;
    1.65        ++i; 
    1.66 @@ -205,7 +205,7 @@
    1.67  
    1.68  //   std::cout << "maximum flow: "<< std::endl;
    1.69  //   for(EdgeIt e=G.first<EdgeIt>(); e.valid(); ++e) { 
    1.70 -//     std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
    1.71 +//     std::cout<<"("<<G.source(e)<< "-"<<flow.get(e)<<"->"<<G.target(e)<<") ";
    1.72  //   }
    1.73  //   std::cout<<std::endl;
    1.74      std::cout << "elapsed time: " << ts << std::endl;