[Lemon-commits] [lemon_svn] alpar: r325 - hugo/trunk/src/work/alpar/dijkstra

[Lemon SVN]

Author: alpar
Date: Sun Mar 21 19:43:15 2004
New Revision: 325

Modified:
   hugo/trunk/src/work/alpar/dijkstra/dijkstra.h

Log:
Bugfix


Modified: hugo/trunk/src/work/alpar/dijkstra/dijkstra.h
==============================================================================
--- hugo/trunk/src/work/alpar/dijkstra/dijkstra.h	(original)
+++ hugo/trunk/src/work/alpar/dijkstra/dijkstra.h	Sun Mar 21 19:43:15 2004
@@ -27,6 +27,7 @@
 #define HUGO_DIJKSTRA_H
 
 #include <fib_heap.h>
+#include <bin_heap.hh>
 #include <invalid.h>
 
 namespace hugo {
@@ -54,22 +55,22 @@
   ///is using \ref BinHeap "binary heap".
   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;
     typedef typename Graph::NodeMap<Node> PredNodeMap;
     typedef typename Graph::NodeMap<ValueType> DistMap;
 
   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;
     PredMap predecessor;