src/work/alpar/dijkstra/dijkstra.cc
changeset 247 fefccf1bdc23
parent 222 0c6bd3a98edf
child 257 7f832b4e5391
     1.1 --- a/src/work/alpar/dijkstra/dijkstra.cc	Fri Mar 26 13:59:59 2004 +0000
     1.2 +++ b/src/work/alpar/dijkstra/dijkstra.cc	Fri Mar 26 14:03:02 2004 +0000
     1.3 @@ -29,10 +29,13 @@
     1.4    
     1.5    //double pre_time=currTime();
     1.6    tim.reset();
     1.7 -  Dijkstra <SmartGraph,
     1.8 -    SmartGraph::EdgeMap<int>,
     1.9 -    FibHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> >
    1.10 -    > dijkstra_test(G, cap); 
    1.11 +//   Dijkstra <SmartGraph,
    1.12 +//     SmartGraph::EdgeMap<int>,
    1.13 +//     FibHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> >
    1.14 +//     > dijkstra_test(G, cap); 
    1.15 +  
    1.16 +  Dijkstra <SmartGraph, SmartGraph::EdgeMap<int>, FibHeap >
    1.17 +    dijkstra_test(G, cap); 
    1.18    
    1.19    dijkstra_test.run(s);
    1.20    //double post_time=currTime();
    1.21 @@ -44,10 +47,13 @@
    1.22   
    1.23    //pre_time=currTime();
    1.24    tim.reset();
    1.25 -  Dijkstra < SmartGraph,
    1.26 -    SmartGraph::EdgeMap<int>,
    1.27 -    BinHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> > > 
    1.28 -    dijkstra_test2(G, cap);
    1.29 +//   Dijkstra < SmartGraph,
    1.30 +//     SmartGraph::EdgeMap<int>,
    1.31 +//     BinHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> > > 
    1.32 +//     dijkstra_test2(G, cap);
    1.33 +  
    1.34 +  Dijkstra <SmartGraph, SmartGraph::EdgeMap<int>, BinHeap >
    1.35 +    dijkstra_test2(G, cap); 
    1.36    
    1.37    dijkstra_test2.run(s);
    1.38    //post_time=currTime();