1.1 --- a/src/include/dijkstra.h Mon Apr 26 18:22:34 2004 +0000
1.2 +++ b/src/include/dijkstra.h Tue Apr 27 08:19:39 2004 +0000
1.3 @@ -43,7 +43,7 @@
1.4 typename Heap>
1.5 #else
1.6 template <typename Graph,
1.7 - typename LengthMap=typename Graph::EdgeMap<int>,
1.8 + typename LengthMap=typename Graph::template EdgeMap<int>,
1.9 template <class,class,class> class Heap = BinHeap >
1.10 #endif
1.11 class Dijkstra{
1.12 @@ -54,9 +54,9 @@
1.13 typedef typename Graph::OutEdgeIt OutEdgeIt;
1.14
1.15 typedef typename LengthMap::ValueType ValueType;
1.16 - typedef typename Graph::NodeMap<Edge> PredMap;
1.17 - typedef typename Graph::NodeMap<Node> PredNodeMap;
1.18 - typedef typename Graph::NodeMap<ValueType> DistMap;
1.19 + typedef typename Graph::template NodeMap<Edge> PredMap;
1.20 + typedef typename Graph::template NodeMap<Node> PredNodeMap;
1.21 + typedef typename Graph::template NodeMap<ValueType> DistMap;
1.22
1.23 private:
1.24 const Graph& G;
1.25 @@ -154,9 +154,10 @@
1.26 pred_node.set(u,INVALID);
1.27 }
1.28
1.29 - typename Graph::NodeMap<int> heap_map(G,-1);
1.30 + typename Graph::template NodeMap<int> heap_map(G,-1);
1.31
1.32 - Heap<Node,ValueType,typename Graph::NodeMap<int> > heap(heap_map);
1.33 + Heap<Node, ValueType, typename Graph::template NodeMap<int> >
1.34 + heap(heap_map);
1.35
1.36 heap.push(s,0);
1.37
2.1 --- a/src/work/marci/leda/makefile Mon Apr 26 18:22:34 2004 +0000
2.2 +++ b/src/work/marci/leda/makefile Tue Apr 27 08:19:39 2004 +0000
2.3 @@ -1,31 +1,12 @@
2.4 CXX2 = g++-2.95
2.5 -#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
2.6 CXX3=$(CXX)
2.7 -#CXX=$(CXX3)
2.8 -#CC=$(CXX)
2.9 -#LEDAROOT ?= /ledasrc/LEDA-4.1
2.10 BOOSTROOT ?= /home/marci/boost
2.11 INCLUDEDIRS ?= -I../../../include -I../.. -I../../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I.
2.12 LDFLAGS = -L$(LEDAROOT) -lG -lL -lm
2.13 -#LEDAINCLUDE ?= -I$(LEDAROOT)/incl
2.14 -#CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
2.15
2.16 BINARIES = bipartite_matching_leda
2.17 -#LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
2.18 -#BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
2.19 -#gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
2.20
2.21 include ../../makefile
2.22 -#all: $(BINARIES)
2.23 -
2.24 -#.depend dep depend:
2.25 -# -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
2.26 -# -g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
2.27 -
2.28 -
2.29 -
2.30 -#makefile: .depend
2.31 -#sinclude .depend
2.32
2.33 leda_graph_demo.o:
2.34 $(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
2.35 @@ -33,12 +14,6 @@
2.36 leda_graph_demo: leda_graph_demo.o
2.37 $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
2.38
2.39 -#bipartite_matching_leda.o:
2.40 -# $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
2.41 -#
2.42 -#bipartite_matching_leda: bipartite_matching_leda.o
2.43 -# $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
2.44 -
2.45 max_bipartite_matching_demo.o:
2.46 $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc
2.47
2.48 @@ -51,16 +26,9 @@
2.49 leda_bfs_dfs: leda_bfs_dfs.o
2.50 $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
2.51
2.52 -#edmonds_karp_demo:
2.53 -# $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
2.54 -# $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
2.55 -
2.56 gw_vs_not:
2.57 $(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
2.58
2.59 -#lg_vs_sg:
2.60 -# $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
2.61 -
2.62 edmonds_karp_demo_alpar:
2.63 $(CXX3) $(CXXFLAGS) -I. -I.. -I../alpar -o edmonds_karp_demo_alpar edmonds_karp_demo_alpar.cc
2.64
2.65 @@ -82,7 +50,3 @@
2.66 preflow_demo_athos:
2.67 $(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
2.68
2.69 -#clean:
2.70 -# $(RM) *.o $(BINARIES) .depend
2.71 -#
2.72 -#.PHONY: all clean dep depend
3.1 --- a/src/work/marci/makefile Mon Apr 26 18:22:34 2004 +0000
3.2 +++ b/src/work/marci/makefile Tue Apr 27 08:19:39 2004 +0000
3.3 @@ -1,29 +1,13 @@
3.4 CXX2 = g++-2.95
3.5 -#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
3.6 CXX3=$(CXX)
3.7 -#CXX=$(CXX3)
3.8 -#CC=$(CXX)
3.9 -#LEDAROOT ?= /ledasrc/LEDA-4.1
3.10 BOOSTROOT ?= /home/marci/boost
3.11 INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
3.12 -#LEDAINCLUDE ?= -I$(LEDAROOT)/incl
3.13 -#CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
3.14
3.15 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
3.16 BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
3.17 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
3.18
3.19 include ../makefile
3.20 -#all: $(BINARIES)
3.21 -
3.22 -#.depend dep depend:
3.23 -# -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
3.24 -# -g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
3.25 -
3.26 -
3.27 -
3.28 -#makefile: .depend
3.29 -#sinclude .depend
3.30
3.31 leda_graph_demo.o:
3.32 $(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
3.33 @@ -31,12 +15,6 @@
3.34 leda_graph_demo: leda_graph_demo.o
3.35 $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
3.36
3.37 -#bipartite_matching_leda.o:
3.38 -# $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
3.39 -#
3.40 -#bipartite_matching_leda: bipartite_matching_leda.o
3.41 -# $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
3.42 -
3.43 max_bipartite_matching_demo.o:
3.44 $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc
3.45
3.46 @@ -49,16 +27,9 @@
3.47 leda_bfs_dfs: leda_bfs_dfs.o
3.48 $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
3.49
3.50 -#edmonds_karp_demo:
3.51 -# $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
3.52 -# $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
3.53 -
3.54 gw_vs_not:
3.55 $(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
3.56
3.57 -#lg_vs_sg:
3.58 -# $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
3.59 -
3.60 edmonds_karp_demo_alpar:
3.61 $(CXX3) $(CXXFLAGS) -I. -I.. -I../alpar -o edmonds_karp_demo_alpar edmonds_karp_demo_alpar.cc
3.62
3.63 @@ -80,7 +51,3 @@
3.64 preflow_demo_athos:
3.65 $(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
3.66
3.67 -#clean:
3.68 -# $(RM) *.o $(BINARIES) .depend
3.69 -#
3.70 -#.PHONY: all clean dep depend