1.1 --- a/src/work/marci/edmonds_karp_demo.cc	Wed Mar 31 16:38:38 2004 +0000
     1.2 +++ b/src/work/marci/edmonds_karp_demo.cc	Wed Mar 31 16:39:42 2004 +0000
     1.3 @@ -93,7 +93,7 @@
     1.4      typedef TrivGraphWrapper<const Graph> GW;
     1.5      GW gw(G);
     1.6      std::cout << "edmonds karp demo (physical blocking flow augmentation)..." << std::endl;
     1.7 -    GW::EdgeMap<int> flow(G); //0 flow
     1.8 +    GW::EdgeMap<int> flow(gw); //0 flow
     1.9  
    1.10      Timer ts;
    1.11      ts.reset();
    1.12 @@ -124,7 +124,7 @@
    1.13      typedef TrivGraphWrapper<const Graph> GW;
    1.14      GW gw(G);
    1.15      std::cout << "edmonds karp demo (physical blocking flow 1 augmentation)..." << std::endl;
    1.16 -    GW::EdgeMap<int> flow(G); //0 flow
    1.17 +    GW::EdgeMap<int> flow(gw); //0 flow
    1.18  
    1.19      Timer ts;
    1.20      ts.reset();
    1.21 @@ -155,7 +155,7 @@
    1.22      typedef TrivGraphWrapper<const Graph> GW;
    1.23      GW gw(G);
    1.24      std::cout << "edmonds karp demo (on-the-fly blocking flow augmentation)..." << std::endl;
    1.25 -    GW::EdgeMap<int> flow(G); //0 flow
    1.26 +    GW::EdgeMap<int> flow(gw); //0 flow
    1.27  
    1.28      Timer ts;
    1.29      ts.reset();

     2.1 --- a/src/work/marci/makefile	Wed Mar 31 16:38:38 2004 +0000
     2.2 +++ b/src/work/marci/makefile	Wed Mar 31 16:39:42 2004 +0000
     2.3 @@ -10,7 +10,7 @@
     2.4  CXXFLAGS = -g -O -W -Wall $(INCLUDEDIRS) -ansi -pedantic
     2.5  
     2.6  LEDABINARIES = lg_vs_sg leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
     2.7 -BINARIES = edmonds_karp_demo
     2.8 +BINARIES = edmonds_karp_demo gw_vs_not
     2.9  #preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
    2.10  
    2.11  all: $(BINARIES)
    2.12 @@ -46,6 +46,9 @@
    2.13  	$(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
    2.14  #	$(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
    2.15  
    2.16 +gw_vs_not: 
    2.17 +	$(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
    2.18 +
    2.19  lg_vs_sg:
    2.20  	$(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
    2.21