Changeset 196:8a9b9360463e in lemon-0.x for src/work/marci

Timestamp:

03/17/04 17:10:33 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

Location:

src/work/marci

Files:

• makefile (modified) (1 diff)
• max_bipartite_matching_demo.cc (modified) (3 diffs)

src/work/marci/makefile

@@ -4 +4 @@
 CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
 #CXXFLAGS = -W -Wall -ansi -pedantic -I. -I.. -I../alpar
-LEDAROOT ?= /ledasrc/LEDA-4.1
+#LEDAROOT ?= /ledasrc/LEDA-4.1
 BOOSTROOT ?= /home/marci/boost
 INCLUDEDIRS ?= -I../../include -I.. -I. -I../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I$(BOOSTROOT)
 CXXFLAGS = -g -O -W -Wall $(INCLUDEDIRS) -ansi -pedantic
 
-
-BINARIES = edmonds_karp_demo preflow_demo_leda lg_vs_sg leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-#preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar
+LEDABINARIES = lg_vs_sg leda_graph_demo leda_bfs_dfs
+BINARIES = edmonds_karp_demo max_bipartite_matching_demo
+#preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
 
 all: $(BINARIES)

src/work/marci/max_bipartite_matching_demo.cc

@@ -5 +5 @@
 #include <cstdlib>
 
-#include <LEDA/graph.h>
-#include <leda_graph_wrapper.h>
+//#include <LEDA/graph.h>
+//#include <leda_graph_wrapper.h>
+#include <list_graph.h>
 #include <dimacs.h>
 #include <time_measure.h>
@@ -39 +40 @@
 
 int main() {
-  leda::graph g;
-  typedef LedaGraphWrapper<leda::graph> Graph;
-  Graph G(g);
+//   leda::graph g;
+//   typedef LedaGraphWrapper<leda::graph> Graph;
+//   Graph G(g);
+  typedef ListGraph Graph;
+  Graph G;
 
   typedef Graph::Node Node;
@@ -62 +65 @@
     t_nodes.push_back(G.addNode());
   }
-//   random_init();
-//   for(int i=0; i<6; ++i) {
-//     G.addEdge(s_nodes[random(4)], t_nodes[random(4)]);
-//   }
+  random_init();
+  for(int i=0; i<6; ++i) {
+    G.addEdge(s_nodes[random(4)], t_nodes[random(4)]);
+  }
   
-  G.addEdge(s_nodes[2], t_nodes[4-4]);
-  G.addEdge(s_nodes[2], t_nodes[7-4]);
-  G.addEdge(s_nodes[2], t_nodes[4-4]);
-  G.addEdge(s_nodes[3], t_nodes[6-4]);
-  G.addEdge(s_nodes[3], t_nodes[5-4]);
-  G.addEdge(s_nodes[3], t_nodes[5-4]);
+//   G.addEdge(s_nodes[2], t_nodes[4-4]);
+//   G.addEdge(s_nodes[2], t_nodes[7-4]);
+//   G.addEdge(s_nodes[2], t_nodes[4-4]);
+//   G.addEdge(s_nodes[3], t_nodes[6-4]);
+//   G.addEdge(s_nodes[3], t_nodes[5-4]);
+//   G.addEdge(s_nodes[3], t_nodes[5-4]);