Changeset 532:2544205de129 in lemon-0.x

Timestamp:

05/05/04 10:18:19 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Compiles also with icc.

File:

• src/include/dijkstra.h (modified) (5 diffs)

src/include/dijkstra.h

@@ -46 +46 @@
   template <typename Graph,
             typename LengthMap=typename Graph::template EdgeMap<int>,
-            template <class,class,class> class Heap = BinHeap >
+            template <class,class,class,class> class Heap = BinHeap >
 #endif
   class Dijkstra{
@@ -147 +147 @@
   ///- The distance of each node from the root.
   template <typename Graph, typename LengthMap,
-            template<class,class,class> class Heap >
+            template<class,class,class,class> class Heap >
   void Dijkstra<Graph,LengthMap,Heap>::run(Node s) {
     
@@ -158 +158 @@
     typename Graph::template NodeMap<int> heap_map(G,-1);
     
-    Heap<Node, ValueType, typename Graph::template NodeMap<int> > 
-      heap(heap_map);
+    typedef Heap<Node, ValueType, typename Graph::template NodeMap<int>,
+      std::less<ValueType> > 
+      HeapType;
+    
+    HeapType heap(heap_map);
     
     heap.push(s,0); 
@@ -177 +180 @@
           
           switch(heap.state(w)) {
-          case heap.PRE_HEAP:
+          case HeapType::PRE_HEAP:
             heap.push(w,oldvalue+length[e]); 
             predecessor.set(w,e);
             pred_node.set(w,v);
             break;
-          case heap.IN_HEAP:
+          case HeapType::IN_HEAP:
             if ( oldvalue+length[e] < heap[w] ) {
               heap.decrease(w, oldvalue+length[e]); 
@@ -189 +192 @@
             }
             break;
-          case heap.POST_HEAP:
+          case HeapType::POST_HEAP:
             break;
           }