[Lemon-commits] [lemon_svn] marci: r580 - in hugo/trunk/src: include work/marci work/marci/leda
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 20:40:21 CET 2006
Author: marci
Date: Tue Apr 27 10:19:39 2004
New Revision: 580
Modified:
hugo/trunk/src/include/dijkstra.h
hugo/trunk/src/work/marci/leda/makefile
hugo/trunk/src/work/marci/makefile
Log:
g++-3.4.0, misc
Modified: hugo/trunk/src/include/dijkstra.h
==============================================================================
--- hugo/trunk/src/include/dijkstra.h (original)
+++ hugo/trunk/src/include/dijkstra.h Tue Apr 27 10:19:39 2004
@@ -43,7 +43,7 @@
typename Heap>
#else
template <typename Graph,
- typename LengthMap=typename Graph::EdgeMap<int>,
+ typename LengthMap=typename Graph::template EdgeMap<int>,
template <class,class,class> class Heap = BinHeap >
#endif
class Dijkstra{
@@ -54,9 +54,9 @@
typedef typename Graph::OutEdgeIt OutEdgeIt;
typedef typename LengthMap::ValueType ValueType;
- typedef typename Graph::NodeMap<Edge> PredMap;
- typedef typename Graph::NodeMap<Node> PredNodeMap;
- typedef typename Graph::NodeMap<ValueType> DistMap;
+ typedef typename Graph::template NodeMap<Edge> PredMap;
+ typedef typename Graph::template NodeMap<Node> PredNodeMap;
+ typedef typename Graph::template NodeMap<ValueType> DistMap;
private:
const Graph& G;
@@ -154,9 +154,10 @@
pred_node.set(u,INVALID);
}
- typename Graph::NodeMap<int> heap_map(G,-1);
+ typename Graph::template NodeMap<int> heap_map(G,-1);
- Heap<Node,ValueType,typename Graph::NodeMap<int> > heap(heap_map);
+ Heap<Node, ValueType, typename Graph::template NodeMap<int> >
+ heap(heap_map);
heap.push(s,0);
Modified: hugo/trunk/src/work/marci/leda/makefile
==============================================================================
--- hugo/trunk/src/work/marci/leda/makefile (original)
+++ hugo/trunk/src/work/marci/leda/makefile Tue Apr 27 10:19:39 2004
@@ -1,31 +1,12 @@
CXX2 = g++-2.95
-#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
CXX3=$(CXX)
-#CXX=$(CXX3)
-#CC=$(CXX)
-#LEDAROOT ?= /ledasrc/LEDA-4.1
BOOSTROOT ?= /home/marci/boost
INCLUDEDIRS ?= -I../../../include -I../.. -I../../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I.
LDFLAGS = -L$(LEDAROOT) -lG -lL -lm
-#LEDAINCLUDE ?= -I$(LEDAROOT)/incl
-#CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
BINARIES = bipartite_matching_leda
-#LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-#BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
-#gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
include ../../makefile
-#all: $(BINARIES)
-
-#.depend dep depend:
-# -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
-# -g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
-
-
-
-#makefile: .depend
-#sinclude .depend
leda_graph_demo.o:
$(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
@@ -33,12 +14,6 @@
leda_graph_demo: leda_graph_demo.o
$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
-#bipartite_matching_leda.o:
-# $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
-#
-#bipartite_matching_leda: bipartite_matching_leda.o
-# $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
-
max_bipartite_matching_demo.o:
$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc
@@ -51,16 +26,9 @@
leda_bfs_dfs: leda_bfs_dfs.o
$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
-#edmonds_karp_demo:
-# $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
-# $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
-
gw_vs_not:
$(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
-#lg_vs_sg:
-# $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
-
edmonds_karp_demo_alpar:
$(CXX3) $(CXXFLAGS) -I. -I.. -I../alpar -o edmonds_karp_demo_alpar edmonds_karp_demo_alpar.cc
@@ -82,7 +50,3 @@
preflow_demo_athos:
$(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
-#clean:
-# $(RM) *.o $(BINARIES) .depend
-#
-#.PHONY: all clean dep depend
Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile (original)
+++ hugo/trunk/src/work/marci/makefile Tue Apr 27 10:19:39 2004
@@ -1,29 +1,13 @@
CXX2 = g++-2.95
-#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
CXX3=$(CXX)
-#CXX=$(CXX3)
-#CC=$(CXX)
-#LEDAROOT ?= /ledasrc/LEDA-4.1
BOOSTROOT ?= /home/marci/boost
INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
-#LEDAINCLUDE ?= -I$(LEDAROOT)/incl
-#CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
#gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
include ../makefile
-#all: $(BINARIES)
-
-#.depend dep depend:
-# -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
-# -g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
-
-
-
-#makefile: .depend
-#sinclude .depend
leda_graph_demo.o:
$(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
@@ -31,12 +15,6 @@
leda_graph_demo: leda_graph_demo.o
$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
-#bipartite_matching_leda.o:
-# $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
-#
-#bipartite_matching_leda: bipartite_matching_leda.o
-# $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
-
max_bipartite_matching_demo.o:
$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc
@@ -49,16 +27,9 @@
leda_bfs_dfs: leda_bfs_dfs.o
$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
-#edmonds_karp_demo:
-# $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
-# $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
-
gw_vs_not:
$(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
-#lg_vs_sg:
-# $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
-
edmonds_karp_demo_alpar:
$(CXX3) $(CXXFLAGS) -I. -I.. -I../alpar -o edmonds_karp_demo_alpar edmonds_karp_demo_alpar.cc
@@ -80,7 +51,3 @@
preflow_demo_athos:
$(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
-#clean:
-# $(RM) *.o $(BINARIES) .depend
-#
-#.PHONY: all clean dep depend
More information about the Lemon-commits
mailing list