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

[Lemon SVN]

Author: marci
Date: Thu Sep 16 15:54:01 2004
New Revision: 1164

Added:
   hugo/trunk/src/work/marci/sub_graph_wrapper_demo.sim
      - copied, changed from r1160, /hugo/trunk/src/work/marci/top_sort.dim
Modified:
   hugo/trunk/src/work/marci/makefile

Log:


Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile	(original)
+++ hugo/trunk/src/work/marci/makefile	Thu Sep 16 15:54:01 2004
@@ -4,7 +4,7 @@
 INCLUDEDIRS ?= -I../{jacint,marci,alpar,klao,akos,athos} -I../.. -I.. -I$(BOOSTROOT)
 
 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-BINARIES = graph_wrapper_time max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_demo top_sort_test max_flow_1 proba7 proba8
+BINARIES = sub_graph_wrapper_demo.cc graph_wrapper_time max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_demo top_sort_test max_flow_1 proba7 proba8
 #BINARIES = preflow_bug
 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
 

Copied: hugo/trunk/src/work/marci/sub_graph_wrapper_demo.sim (from r1160, /hugo/trunk/src/work/marci/top_sort.dim)
==============================================================================
--- /hugo/trunk/src/work/marci/top_sort.dim	(original)
+++ hugo/trunk/src/work/marci/sub_graph_wrapper_demo.sim	Thu Sep 16 15:54:01 2004
@@ -1,6 +1,14 @@
-p mat 5 5
-a 1 3
-a 2 3
-a 3 5
-a 4 3
-a 5 4
\ No newline at end of file
+c HUGO max flow problem
+p max 7 9
+n 1 s
+n 7 t
+a 1 2 3
+a 1 3 2
+a 1 4 1
+a 2 5 3
+a 3 5 2
+a 3 7 5
+a 3 6 3
+a 4 6 1
+a 5 7 2
+a 6 7 4