Changeset 247:fefccf1bdc23 in lemon-0.x for src/work/alpar/dijkstra/dijkstra.cc

Timestamp:

03/26/04 15:03:02 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Heap is now a template-template parameter

File:

• src/work/alpar/dijkstra/dijkstra.cc (modified) (2 diffs)

src/work/alpar/dijkstra/dijkstra.cc

@@ -30 +30 @@
   //double pre_time=currTime();
   tim.reset();
-  Dijkstra <SmartGraph,
-    SmartGraph::EdgeMap<int>,
-    FibHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> >
-    > dijkstra_test(G, cap); 
+//   Dijkstra <SmartGraph,
+//     SmartGraph::EdgeMap<int>,
+//     FibHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> >
+//     > dijkstra_test(G, cap); 
+  
+  Dijkstra <SmartGraph, SmartGraph::EdgeMap<int>, FibHeap >
+    dijkstra_test(G, cap); 
   
   dijkstra_test.run(s);
@@ -45 +48 @@
   //pre_time=currTime();
   tim.reset();
-  Dijkstra < SmartGraph,
-    SmartGraph::EdgeMap<int>,
-    BinHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> > > 
-    dijkstra_test2(G, cap);
+//   Dijkstra < SmartGraph,
+//     SmartGraph::EdgeMap<int>,
+//     BinHeap<SmartGraph::Node, int, SmartGraph::NodeMap<int> > > 
+//     dijkstra_test2(G, cap);
+  
+  Dijkstra <SmartGraph, SmartGraph::EdgeMap<int>, BinHeap >
+    dijkstra_test2(G, cap); 
   
   dijkstra_test2.run(s);