diff -r e997802b855c -r 87f7c54892df src/lemon/dijkstra.h --- a/src/lemon/dijkstra.h Sat Nov 13 12:53:28 2004 +0000 +++ b/src/lemon/dijkstra.h Sat Nov 13 17:07:10 2004 +0000 @@ -37,7 +37,7 @@ ///so it is easy to change it to any kind of length. /// ///The type of the length is determined by the - ///\ref concept::ReadMap::ValueType "ValueType" of the length map. + ///\ref concept::ReadMap::Value "Value" of the length map. /// ///It is also possible to change the underlying priority heap. /// @@ -81,7 +81,7 @@ typedef typename Graph::OutEdgeIt OutEdgeIt; ///The type of the length of the edges. - typedef typename LM::ValueType ValueType; + typedef typename LM::Value Value; ///The type of the map that stores the edge lengths. typedef LM LengthMap; ///\brief The type of the map that stores the last @@ -91,7 +91,7 @@ ///nodes of the shortest paths. typedef typename Graph::template NodeMap PredNodeMap; ///The type of the map that stores the dists of the nodes. - typedef typename Graph::template NodeMap DistMap; + typedef typename Graph::template NodeMap DistMap; private: /// Pointer to the underlying graph. @@ -237,8 +237,8 @@ typename GR::template NodeMap heap_map(*G,-1); - typedef Heap, - std::less > + typedef Heap, + std::less > HeapType; HeapType heap(heap_map); @@ -248,7 +248,7 @@ while ( !heap.empty() ) { Node v=heap.top(); - ValueType oldvalue=heap[v]; + Value oldvalue=heap[v]; heap.pop(); distance->set(v, oldvalue); @@ -281,7 +281,7 @@ ///\pre \ref run() must be called before using this function. ///\warning If node \c v in unreachable from the root the return value ///of this funcion is undefined. - ValueType dist(Node v) const { return (*distance)[v]; } + Value dist(Node v) const { return (*distance)[v]; } ///Returns the 'previous edge' of the shortest path tree.