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

[Lemon SVN]

Author: marci
Date: Fri Mar 12 21:09:35 2004
New Revision: 256

Modified:
   hugo/trunk/src/work/marci/dimacs.h
   hugo/trunk/src/work/marci/makefile

Log:
.


Modified: hugo/trunk/src/work/marci/dimacs.h
==============================================================================
--- hugo/trunk/src/work/marci/dimacs.h	(original)
+++ hugo/trunk/src/work/marci/dimacs.h	Fri Mar 12 21:09:35 2004
@@ -18,6 +18,7 @@
     int i, j;
     std::string str;
     int n, m; 
+    typename Graph::Edge e;
     std::vector<typename Graph::Node> nodes;
     while (is>>c) {
       switch (c) {
@@ -49,7 +50,7 @@
       case 'a':
 	is >> i >> j >> cap;
 	getline(is, str);
-	typename Graph::Edge e=G.addEdge(nodes[i], nodes[j]);
+	e=G.addEdge(nodes[i], nodes[j]);
 	capacity.update();
 	capacity.set(e, cap);
 	break;

Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile	(original)
+++ hugo/trunk/src/work/marci/makefile	Fri Mar 12 21:09:35 2004
@@ -1,20 +1,33 @@
-CXX3 = g++-3.0
+#CXX3 = g++-3.0
 CXX2 = g++-2.95
-CXX3.3 = g++
-CXXFLAGS = -W -Wall -ansi -pedantic -I. -I.. -I../alpar
+#CXX3.3 = g++
+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
+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 edmonds_karp_demo_alpar preflow_demo_leda preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos lg_vs_sg
+
+BINARIES = edmonds_karp_demo preflow_demo_leda lg_vs_sg leda_graph_demo
+#preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar
 
 all: $(BINARIES)
 
 .depend dep depend:
-	-g++-2.95 -I. -I.. -I$(LEDAROOT)/incl -I/home/marci/boost -M *.cc > .depend 2>/dev/null
+	-g++ $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
+
 
 
 makefile: .depend
 sinclude .depend
 
+leda_graph_demo.o:
+	$(CXX3) -Wall -O0 -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
+
+leda_graph_demo: leda_graph_demo.o
+	$(CXX3) -Wall -O0 -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
+
 edmonds_karp_demo: 
 	$(CXX3) $(CXXFLAGS) -g -I. -I.. -o edmonds_karp_demo edmonds_karp_demo.cc
 	$(CXX3) $(CXXFLAGS) -g -pg -O3 -I. -I.. -o edmonds_karp_demo_prof edmonds_karp_demo.cc
@@ -29,7 +42,7 @@
 	$(CXX2) -W -Wall -O3 -DLEDA_PREFIX -I. -I$(LEDAROOT)/incl -L$(LEDAROOT) -o preflow_demo_leda preflow_demo_leda.cc -lP -lm -lL -lG
 
 preflow_demo_leda_uj:
-	$(CXX3.3) -Wall -O3 -I$(LEDAROOT)/incl -I. -L$(LEDAROOT) -o preflow_demo_leda_uj preflow_demo_leda_uj.cc -lG -lL -lm
+	$(CXX3) -Wall -O3 -I$(LEDAROOT)/incl -I. -L$(LEDAROOT) -o preflow_demo_leda_uj preflow_demo_leda_uj.cc -lG -lL -lm
 
 preflow_demo_boost:
 	$(CXX2) -ftemplate-depth-30 -O3 -I. -I/home/marci/boost -o preflow_demo_boost preflow_demo_boost.cc