Minor changes.
authordeba
Tue, 12 Apr 2005 17:37:22 +0000
changeset 134571e0777b65e0
parent 1344 9146f77f6d67
child 1346 639dadf8c00d
Minor changes.
src/lemon/dijkstra.h
     1.1 --- a/src/lemon/dijkstra.h	Tue Apr 12 17:35:36 2005 +0000
     1.2 +++ b/src/lemon/dijkstra.h	Tue Apr 12 17:37:22 2005 +0000
     1.3 @@ -599,8 +599,8 @@
     1.4      ///
     1.5      ///\param nm must be a bool (or convertible) node map. The algorithm
     1.6      ///will stop when it reaches a node \c v with <tt>nm[v]==true</tt>.
     1.7 -    template<class NM>
     1.8 -    void start(const NM &nm)
     1.9 +    template<class NodeBoolMap>
    1.10 +    void start(const NodeBoolMap &nm)
    1.11      {
    1.12        while ( !_heap.empty() && !nm[_heap.top()] ) processNextNode();
    1.13        if ( !_heap.empty() ) finalizeNodeData(_heap.top(),_heap.prio());
    1.14 @@ -954,11 +954,11 @@
    1.15      {
    1.16        if(Base::_source==INVALID) throw UninitializedParameter();
    1.17        Dijkstra<Graph,LengthMap,TR> 
    1.18 -	Dij(*(Graph*)Base::_g,*(LengthMap*)Base::_length);
    1.19 -      if(Base::_pred) Dij.predMap(*(PredMap*)Base::_pred);
    1.20 +	dij(*(Graph*)Base::_g,*(LengthMap*)Base::_length);
    1.21 +      if(Base::_pred) dij.predMap(*(PredMap*)Base::_pred);
    1.22  //       if(Base::_predNode) Dij.predNodeMap(*(PredNodeMap*)Base::_predNode);
    1.23 -      if(Base::_dist) Dij.distMap(*(DistMap*)Base::_dist);
    1.24 -      Dij.run(Base::_source);
    1.25 +      if(Base::_dist) dij.distMap(*(DistMap*)Base::_dist);
    1.26 +      dij.run(Base::_source);
    1.27      }
    1.28  
    1.29      ///Runs Dijkstra algorithm from the given node.