Changeset 271:951cd01495e7 in lemon-0.x for src/work/marci

Timestamp:

03/31/04 18:39:42 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@377

Message:

makefile, you see...

Location:

src/work/marci

Files:

• edmonds_karp_demo.cc (modified) (3 diffs)
• makefile (modified) (2 diffs)

src/work/marci/edmonds_karp_demo.cc

@@ -94 +94 @@
     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;
@@ -125 +125 @@
     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;
@@ -156 +156 @@
     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;

src/work/marci/makefile

@@ -11 +11 @@
 
 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
 
@@ -47 +47 @@
 #       $(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