[Lemon-commits] [lemon_svn] marci: r377 - hugo/trunk/src/work/marci

[Lemon SVN]

Author: marci
Date: Wed Mar 31 18:39:42 2004
New Revision: 377

Modified:
   hugo/trunk/src/work/marci/edmonds_karp_demo.cc
   hugo/trunk/src/work/marci/makefile

Log:
makefile, you see...


Modified: hugo/trunk/src/work/marci/edmonds_karp_demo.cc
==============================================================================
--- hugo/trunk/src/work/marci/edmonds_karp_demo.cc	(original)
+++ hugo/trunk/src/work/marci/edmonds_karp_demo.cc	Wed Mar 31 18:39:42 2004
@@ -93,7 +93,7 @@
     typedef TrivGraphWrapper<const Graph> GW;
     GW gw(G);
     std::cout << "edmonds karp demo (physical blocking flow augmentation)..." << std::endl;
-    GW::EdgeMap<int> flow(G); //0 flow
+    GW::EdgeMap<int> flow(gw); //0 flow
 
     Timer ts;
     ts.reset();
@@ -124,7 +124,7 @@
     typedef TrivGraphWrapper<const Graph> GW;
     GW gw(G);
     std::cout << "edmonds karp demo (physical blocking flow 1 augmentation)..." << std::endl;
-    GW::EdgeMap<int> flow(G); //0 flow
+    GW::EdgeMap<int> flow(gw); //0 flow
 
     Timer ts;
     ts.reset();
@@ -155,7 +155,7 @@
     typedef TrivGraphWrapper<const Graph> GW;
     GW gw(G);
     std::cout << "edmonds karp demo (on-the-fly blocking flow augmentation)..." << std::endl;
-    GW::EdgeMap<int> flow(G); //0 flow
+    GW::EdgeMap<int> flow(gw); //0 flow
 
     Timer ts;
     ts.reset();

Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile	(original)
+++ hugo/trunk/src/work/marci/makefile	Wed Mar 31 18:39:42 2004
@@ -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