Changeset 228:1d5f4cd0342c in lemon-0.x for src/work/alpar

Timestamp:

03/21/04 19:43:15 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Bugfix

File:

• src/work/alpar/dijkstra/dijkstra.h (modified) (3 diffs)

src/work/alpar/dijkstra/dijkstra.h

@@ -28 +28 @@
 
 #include <fib_heap.h>
+#include <bin_heap.hh>
 #include <invalid.h>
 
@@ -55 +56 @@
   template <typename Graph,
             typename LengthMap=typename Graph::EdgeMap<int>,
-            typename Heap=BinHeap<typename Graph::Node,
-                                  typename LengthMap::ValueType, 
-                                  typename Graph::NodeMap<int> > >
+            typename Heap=BinHeap <typename Graph::Node,
+                                   typename LengthMap::ValueType, 
+                                   typename Graph::NodeMap<int> > >
   class Dijkstra{
   public:
+    typedef typename Graph::Node Node;
+    typedef typename Graph::NodeIt NodeIt;
+    typedef typename Graph::Edge Edge;
+    typedef typename Graph::OutEdgeIt OutEdgeIt;
+    
     typedef typename LengthMap::ValueType ValueType;
     typedef typename Graph::NodeMap<Edge> PredMap;
@@ -66 +72 @@
 
   private:
-    typedef typename Graph::Node Node;
-    typedef typename Graph::NodeIt NodeIt;
-    typedef typename Graph::Edge Edge;
-    typedef typename Graph::OutEdgeIt OutEdgeIt;
-    
     const Graph& G;
     const LengthMap& length;