1.1 --- a/src/work/alpar/dijkstra/dijkstra.h	Sun Mar 21 17:20:20 2004 +0000
     1.2 +++ b/src/work/alpar/dijkstra/dijkstra.h	Sun Mar 21 18:43:15 2004 +0000
     1.3 @@ -27,6 +27,7 @@
     1.4  #define HUGO_DIJKSTRA_H
     1.5  
     1.6  #include <fib_heap.h>
     1.7 +#include <bin_heap.hh>
     1.8  #include <invalid.h>
     1.9  
    1.10  namespace hugo {
    1.11 @@ -54,22 +55,22 @@
    1.12    ///is using \ref BinHeap "binary heap".
    1.13    template <typename Graph,
    1.14  	    typename LengthMap=typename Graph::EdgeMap<int>,
    1.15 -	    typename Heap=BinHeap<typename Graph::Node,
    1.16 -				  typename LengthMap::ValueType, 
    1.17 -				  typename Graph::NodeMap<int> > >
    1.18 +	    typename Heap=BinHeap <typename Graph::Node,
    1.19 +				   typename LengthMap::ValueType, 
    1.20 +				   typename Graph::NodeMap<int> > >
    1.21    class Dijkstra{
    1.22    public:
    1.23 +    typedef typename Graph::Node Node;
    1.24 +    typedef typename Graph::NodeIt NodeIt;
    1.25 +    typedef typename Graph::Edge Edge;
    1.26 +    typedef typename Graph::OutEdgeIt OutEdgeIt;
    1.27 +    
    1.28      typedef typename LengthMap::ValueType ValueType;
    1.29      typedef typename Graph::NodeMap<Edge> PredMap;
    1.30      typedef typename Graph::NodeMap<Node> PredNodeMap;
    1.31      typedef typename Graph::NodeMap<ValueType> DistMap;
    1.32  
    1.33    private:
    1.34 -    typedef typename Graph::Node Node;
    1.35 -    typedef typename Graph::NodeIt NodeIt;
    1.36 -    typedef typename Graph::Edge Edge;
    1.37 -    typedef typename Graph::OutEdgeIt OutEdgeIt;
    1.38 -    
    1.39      const Graph& G;
    1.40      const LengthMap& length;
    1.41      PredMap predecessor;