# HG changeset patch # User marci # Date 1080751182 0 # Node ID 951cd01495e7a352c1222fa27bd304041fe6ff80 # Parent e4811faaaa75ca784d32803a24436d196fd25673 makefile, you see... diff -r e4811faaaa75 -r 951cd01495e7 src/work/marci/edmonds_karp_demo.cc --- a/src/work/marci/edmonds_karp_demo.cc Wed Mar 31 16:38:38 2004 +0000 +++ b/src/work/marci/edmonds_karp_demo.cc Wed Mar 31 16:39:42 2004 +0000 @@ -93,7 +93,7 @@ typedef TrivGraphWrapper GW; GW gw(G); std::cout << "edmonds karp demo (physical blocking flow augmentation)..." << std::endl; - GW::EdgeMap flow(G); //0 flow + GW::EdgeMap flow(gw); //0 flow Timer ts; ts.reset(); @@ -124,7 +124,7 @@ typedef TrivGraphWrapper GW; GW gw(G); std::cout << "edmonds karp demo (physical blocking flow 1 augmentation)..." << std::endl; - GW::EdgeMap flow(G); //0 flow + GW::EdgeMap flow(gw); //0 flow Timer ts; ts.reset(); @@ -155,7 +155,7 @@ typedef TrivGraphWrapper GW; GW gw(G); std::cout << "edmonds karp demo (on-the-fly blocking flow augmentation)..." << std::endl; - GW::EdgeMap flow(G); //0 flow + GW::EdgeMap flow(gw); //0 flow Timer ts; ts.reset(); diff -r e4811faaaa75 -r 951cd01495e7 src/work/marci/makefile --- a/src/work/marci/makefile Wed Mar 31 16:38:38 2004 +0000 +++ b/src/work/marci/makefile Wed Mar 31 16:39:42 2004 +0000 @@ -10,7 +10,7 @@ CXXFLAGS = -g -O -W -Wall $(INCLUDEDIRS) -ansi -pedantic LEDABINARIES = lg_vs_sg leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo -BINARIES = edmonds_karp_demo +BINARIES = edmonds_karp_demo gw_vs_not #preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda all: $(BINARIES) @@ -46,6 +46,9 @@ $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc # $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc +gw_vs_not: + $(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc + lg_vs_sg: $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc