1.1 --- a/src/work/alpar/dijkstra.h	Sat Nov 13 12:53:28 2004 +0000
     1.2 +++ b/src/work/alpar/dijkstra.h	Sat Nov 13 17:07:10 2004 +0000
     1.3 @@ -46,7 +46,7 @@
     1.4      ///
     1.5      typedef LM LengthMap;
     1.6      //The type of the length of the edges.
     1.7 -    typedef typename LM::ValueType ValueType;
     1.8 +    typedef typename LM::Value Value;
     1.9      ///The heap type used by Dijkstra algorithm.
    1.10  
    1.11      ///The heap type used by Dijkstra algorithm.
    1.12 @@ -54,9 +54,9 @@
    1.13      ///\sa BinHeap
    1.14      ///\sa Dijkstra
    1.15      typedef BinHeap<typename Graph::Node,
    1.16 -		    typename LM::ValueType,
    1.17 +		    typename LM::Value,
    1.18  		    typename GR::template NodeMap<int>,
    1.19 -		    std::less<ValueType> > Heap;
    1.20 +		    std::less<Value> > Heap;
    1.21  
    1.22      ///\brief The type of the map that stores the last
    1.23      ///edges of the shortest paths.
    1.24 @@ -90,7 +90,7 @@
    1.25   
    1.26      ///It must meet the \ref concept::WriteMap "WriteMap" concept.
    1.27      ///
    1.28 -    typedef typename Graph::template NodeMap<typename LM::ValueType> DistMap;
    1.29 +    typedef typename Graph::template NodeMap<typename LM::Value> DistMap;
    1.30      ///Instantiates a DistMap.
    1.31   
    1.32      ///\todo Please document...
    1.33 @@ -109,7 +109,7 @@
    1.34    ///so it is easy to change it to any kind of length.
    1.35    ///
    1.36    ///The type of the length is determined by the
    1.37 -  ///\ref concept::ReadMap::ValueType "ValueType" of the length map.
    1.38 +  ///\ref concept::ReadMap::Value "Value" of the length map.
    1.39    ///
    1.40    ///It is also possible to change the underlying priority heap.
    1.41    ///
    1.42 @@ -158,7 +158,7 @@
    1.43      typedef typename Graph::OutEdgeIt OutEdgeIt;
    1.44      
    1.45      ///The type of the length of the edges.
    1.46 -    typedef typename TR::LengthMap::ValueType ValueType;
    1.47 +    typedef typename TR::LengthMap::Value Value;
    1.48      ///The type of the map that stores the edge lengths.
    1.49      typedef typename TR::LengthMap LengthMap;
    1.50      ///\brief The type of the map that stores the last
    1.51 @@ -387,7 +387,7 @@
    1.52        while ( !heap.empty() ) {
    1.53  	
    1.54  	Node v=heap.top(); 
    1.55 -	ValueType oldvalue=heap[v];
    1.56 +	Value oldvalue=heap[v];
    1.57  	heap.pop();
    1.58  	distance->set(v, oldvalue);
    1.59  	
    1.60 @@ -420,7 +420,7 @@
    1.61      ///\pre \ref run() must be called before using this function.
    1.62      ///\warning If node \c v in unreachable from the root the return value
    1.63      ///of this funcion is undefined.
    1.64 -    ValueType dist(Node v) const { return (*distance)[v]; }
    1.65 +    Value dist(Node v) const { return (*distance)[v]; }
    1.66  
    1.67      ///Returns the 'previous edge' of the shortest path tree.
    1.68  
    1.69 @@ -497,7 +497,7 @@
    1.70      ///The type of the map that stores the edge lengths.
    1.71      typedef typename TR::LengthMap LengthMap;
    1.72      ///The type of the length of the edges.
    1.73 -    typedef typename LengthMap::ValueType ValueType;
    1.74 +    typedef typename LengthMap::Value Value;
    1.75      ///\brief The type of the map that stores the last
    1.76      ///edges of the shortest paths.
    1.77      typedef typename TR::PredMap PredMap;