src/lemon/dijkstra.h
changeset 987 87f7c54892df
parent 986 e997802b855c
     1.1 --- a/src/lemon/dijkstra.h	Sat Nov 13 12:53:28 2004 +0000
     1.2 +++ b/src/lemon/dijkstra.h	Sat Nov 13 17:07:10 2004 +0000
     1.3 @@ -37,7 +37,7 @@
     1.4    ///so it is easy to change it to any kind of length.
     1.5    ///
     1.6    ///The type of the length is determined by the
     1.7 -  ///\ref concept::ReadMap::ValueType "ValueType" of the length map.
     1.8 +  ///\ref concept::ReadMap::Value "Value" of the length map.
     1.9    ///
    1.10    ///It is also possible to change the underlying priority heap.
    1.11    ///
    1.12 @@ -81,7 +81,7 @@
    1.13      typedef typename Graph::OutEdgeIt OutEdgeIt;
    1.14      
    1.15      ///The type of the length of the edges.
    1.16 -    typedef typename LM::ValueType ValueType;
    1.17 +    typedef typename LM::Value Value;
    1.18      ///The type of the map that stores the edge lengths.
    1.19      typedef LM LengthMap;
    1.20      ///\brief The type of the map that stores the last
    1.21 @@ -91,7 +91,7 @@
    1.22      ///nodes of the shortest paths.
    1.23      typedef typename Graph::template NodeMap<Node> PredNodeMap;
    1.24      ///The type of the map that stores the dists of the nodes.
    1.25 -    typedef typename Graph::template NodeMap<ValueType> DistMap;
    1.26 +    typedef typename Graph::template NodeMap<Value> DistMap;
    1.27  
    1.28    private:
    1.29      /// Pointer to the underlying graph.
    1.30 @@ -237,8 +237,8 @@
    1.31        
    1.32        typename GR::template NodeMap<int> heap_map(*G,-1);
    1.33        
    1.34 -      typedef Heap<Node, ValueType, typename GR::template NodeMap<int>,
    1.35 -      std::less<ValueType> > 
    1.36 +      typedef Heap<Node, Value, typename GR::template NodeMap<int>,
    1.37 +      std::less<Value> > 
    1.38        HeapType;
    1.39        
    1.40        HeapType heap(heap_map);
    1.41 @@ -248,7 +248,7 @@
    1.42        while ( !heap.empty() ) {
    1.43  	
    1.44  	Node v=heap.top(); 
    1.45 -	ValueType oldvalue=heap[v];
    1.46 +	Value oldvalue=heap[v];
    1.47  	heap.pop();
    1.48  	distance->set(v, oldvalue);
    1.49  	
    1.50 @@ -281,7 +281,7 @@
    1.51      ///\pre \ref run() must be called before using this function.
    1.52      ///\warning If node \c v in unreachable from the root the return value
    1.53      ///of this funcion is undefined.
    1.54 -    ValueType dist(Node v) const { return (*distance)[v]; }
    1.55 +    Value dist(Node v) const { return (*distance)[v]; }
    1.56  
    1.57      ///Returns the 'previous edge' of the shortest path tree.
    1.58