[Lemon-commits] [lemon_svn] marci: r1034 - in hugo/trunk/src/work/marci: . leda

[Lemon SVN]

Author: marci
Date: Mon Aug 23 13:44:36 2004
New Revision: 1034

Added:
   hugo/trunk/src/work/marci/bipartite_matching_demo.cc
      - copied, changed from r1031, /hugo/trunk/src/work/marci/bipartite_matching_try_3.cc
   hugo/trunk/src/work/marci/leda/bipartite_matching_comparison.cc
      - copied unchanged from r1033, /hugo/trunk/src/work/marci/leda/comparison.cc
   hugo/trunk/src/work/marci/leda/max_bipartite_matching_demo.cc
      - copied unchanged from r1031, /hugo/trunk/src/work/marci/max_bipartite_matching_demo.cc
Removed:
   hugo/trunk/src/work/marci/bipartite_matching_try.cc
   hugo/trunk/src/work/marci/bipartite_matching_try_3.cc
   hugo/trunk/src/work/marci/leda/comparison.cc
   hugo/trunk/src/work/marci/max_bipartite_matching_demo.cc
Modified:
   hugo/trunk/src/work/marci/leda/makefile
   hugo/trunk/src/work/marci/makefile

Log:
sg is moved sg is not...


Copied: hugo/trunk/src/work/marci/bipartite_matching_demo.cc (from r1031, /hugo/trunk/src/work/marci/bipartite_matching_try_3.cc)
==============================================================================
--- /hugo/trunk/src/work/marci/bipartite_matching_try_3.cc	(original)
+++ hugo/trunk/src/work/marci/bipartite_matching_demo.cc	Mon Aug 23 13:44:36 2004
@@ -17,6 +17,7 @@
 
 using namespace hugo;
 
+using std::cin;
 using std::cout;
 using std::endl;
 
@@ -34,13 +35,13 @@
 
   int a;
   cout << "number of nodes in the first color class=";
-  std::cin >> a; 
+  cin >> a; 
   int b;
   cout << "number of nodes in the second color class=";
-  std::cin >> b; 
+  cin >> b; 
   int m;
   cout << "number of edges=";
-  std::cin >> m; 
+  cin >> m; 
   
   cout << "Generatig a random bipartite graph..." << endl;
   random_init();

Modified: hugo/trunk/src/work/marci/leda/makefile
==============================================================================
--- hugo/trunk/src/work/marci/leda/makefile	(original)
+++ hugo/trunk/src/work/marci/leda/makefile	Mon Aug 23 13:44:36 2004
@@ -4,7 +4,7 @@
 INCLUDEDIRS ?= -I. -I../.. -I../../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I../../..
 LDFLAGS = -L$(LEDAROOT) -lG -lL -lm
 
-BINARIES = bipartite_matching_leda bipartite_matching_leda_gen comparison
+BINARIES = bipartite_matching_leda bipartite_matching_leda_gen bipartite_matching_comparison
 
 include ../../makefile
 

Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile	(original)
+++ hugo/trunk/src/work/marci/makefile	Mon Aug 23 13:44:36 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 = max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try bipartite_matching_try_3 top_sort_test max_flow_1
+BINARIES = 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
 #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