COIN-OR::LEMON - Graph Library

Changeset 433:d9fac1497298 in lemon-0.x


Ignore:
Timestamp:
04/27/04 10:19:39 (16 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@580
Message:

g++-3.4.0, misc

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/include/dijkstra.h

    r430 r433  
    4444#else
    4545  template <typename Graph,
    46             typename LengthMap=typename Graph::EdgeMap<int>,
     46            typename LengthMap=typename Graph::template EdgeMap<int>,
    4747            template <class,class,class> class Heap = BinHeap >
    4848#endif
     
    5555   
    5656    typedef typename LengthMap::ValueType ValueType;
    57     typedef typename Graph::NodeMap<Edge> PredMap;
    58     typedef typename Graph::NodeMap<Node> PredNodeMap;
    59     typedef typename Graph::NodeMap<ValueType> DistMap;
     57    typedef typename Graph::template NodeMap<Edge> PredMap;
     58    typedef typename Graph::template NodeMap<Node> PredNodeMap;
     59    typedef typename Graph::template NodeMap<ValueType> DistMap;
    6060
    6161  private:
     
    155155    }
    156156   
    157     typename Graph::NodeMap<int> heap_map(G,-1);
    158    
    159     Heap<Node,ValueType,typename Graph::NodeMap<int> > heap(heap_map);
     157    typename Graph::template NodeMap<int> heap_map(G,-1);
     158   
     159    Heap<Node, ValueType, typename Graph::template NodeMap<int> >
     160      heap(heap_map);
    160161   
    161162    heap.push(s,0);
  • src/work/marci/leda/makefile

    r420 r433  
    11CXX2 = g++-2.95
    2 #CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
    32CXX3=$(CXX)
    4 #CXX=$(CXX3)
    5 #CC=$(CXX)
    6 #LEDAROOT ?= /ledasrc/LEDA-4.1
    73BOOSTROOT ?= /home/marci/boost
    84INCLUDEDIRS ?= -I../../../include -I../.. -I../../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I.
    95LDFLAGS = -L$(LEDAROOT) -lG -lL -lm
    10 #LEDAINCLUDE ?= -I$(LEDAROOT)/incl
    11 #CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
    126
    137BINARIES = bipartite_matching_leda
    14 #LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
    15 #BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
    16 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
    178
    189include ../../makefile
    19 #all: $(BINARIES)
    20 
    21 #.depend dep depend:
    22 #       -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
    23 #       -g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
    24 
    25 
    26 
    27 #makefile: .depend
    28 #sinclude .depend
    2910
    3011leda_graph_demo.o:
     
    3314leda_graph_demo: leda_graph_demo.o
    3415        $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
    35 
    36 #bipartite_matching_leda.o:
    37 #       $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
    38 #
    39 #bipartite_matching_leda: bipartite_matching_leda.o
    40 #       $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
    4116
    4217max_bipartite_matching_demo.o:
     
    5227        $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
    5328
    54 #edmonds_karp_demo:
    55 #       $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
    56 #       $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
    57 
    5829gw_vs_not:
    5930        $(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
    60 
    61 #lg_vs_sg:
    62 #       $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
    6331
    6432edmonds_karp_demo_alpar:
     
    8351        $(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
    8452
    85 #clean:
    86 #       $(RM) *.o $(BINARIES) .depend
    87 #
    88 #.PHONY: all clean dep depend
  • src/work/marci/makefile

    r420 r433  
    11CXX2 = g++-2.95
    2 #CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
    32CXX3=$(CXX)
    4 #CXX=$(CXX3)
    5 #CC=$(CXX)
    6 #LEDAROOT ?= /ledasrc/LEDA-4.1
    73BOOSTROOT ?= /home/marci/boost
    84INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
    9 #LEDAINCLUDE ?= -I$(LEDAROOT)/incl
    10 #CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
    115
    126LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
     
    159
    1610include ../makefile
    17 #all: $(BINARIES)
    18 
    19 #.depend dep depend:
    20 #       -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
    21 #       -g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
    22 
    23 
    24 
    25 #makefile: .depend
    26 #sinclude .depend
    2711
    2812leda_graph_demo.o:
     
    3115leda_graph_demo: leda_graph_demo.o
    3216        $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
    33 
    34 #bipartite_matching_leda.o:
    35 #       $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
    36 #
    37 #bipartite_matching_leda: bipartite_matching_leda.o
    38 #       $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
    3917
    4018max_bipartite_matching_demo.o:
     
    5028        $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
    5129
    52 #edmonds_karp_demo:
    53 #       $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
    54 #       $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
    55 
    5630gw_vs_not:
    5731        $(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
    58 
    59 #lg_vs_sg:
    60 #       $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
    6132
    6233edmonds_karp_demo_alpar:
     
    8152        $(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
    8253
    83 #clean:
    84 #       $(RM) *.o $(BINARIES) .depend
    85 #
    86 #.PHONY: all clean dep depend
Note: See TracChangeset for help on using the changeset viewer.