Changeset 180:95f0c5f3fc70 in lemon-0.x for src/work/marci

Timestamp:

03/12/04 21:09:35 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

Location:

src/work/marci

Files:

• dimacs.h (modified) (2 diffs)
• makefile (modified) (2 diffs)

src/work/marci/dimacs.h

@@ -19 +19 @@
     std::string str;
     int n, m; 
+    typename Graph::Edge e;
     std::vector<typename Graph::Node> nodes;
     while (is>>c) {
@@ -50 +51 @@
         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);

src/work/marci/makefile

@@ -1 @@
-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: 
@@ -30 +43 @@
 
 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: