[Lemon-commits] [lemon_svn] deba: r1784 - hugo/trunk/src/lemon

[Lemon SVN]

Author: deba
Date: Tue Apr 12 19:37:22 2005
New Revision: 1784

Modified:
   hugo/trunk/src/lemon/dijkstra.h

Log:
Minor changes.



Modified: hugo/trunk/src/lemon/dijkstra.h
==============================================================================
--- hugo/trunk/src/lemon/dijkstra.h	(original)
+++ hugo/trunk/src/lemon/dijkstra.h	Tue Apr 12 19:37:22 2005
@@ -599,8 +599,8 @@
     ///
     ///\param nm must be a bool (or convertible) node map. The algorithm
     ///will stop when it reaches a node \c v with <tt>nm[v]==true</tt>.
-    template<class NM>
-    void start(const NM &nm)
+    template<class NodeBoolMap>
+    void start(const NodeBoolMap &nm)
     {
       while ( !_heap.empty() && !nm[_heap.top()] ) processNextNode();
       if ( !_heap.empty() ) finalizeNodeData(_heap.top(),_heap.prio());
@@ -954,11 +954,11 @@
     {
       if(Base::_source==INVALID) throw UninitializedParameter();
       Dijkstra<Graph,LengthMap,TR> 
-	Dij(*(Graph*)Base::_g,*(LengthMap*)Base::_length);
-      if(Base::_pred) Dij.predMap(*(PredMap*)Base::_pred);
+	dij(*(Graph*)Base::_g,*(LengthMap*)Base::_length);
+      if(Base::_pred) dij.predMap(*(PredMap*)Base::_pred);
 //       if(Base::_predNode) Dij.predNodeMap(*(PredNodeMap*)Base::_predNode);
-      if(Base::_dist) Dij.distMap(*(DistMap*)Base::_dist);
-      Dij.run(Base::_source);
+      if(Base::_dist) dij.distMap(*(DistMap*)Base::_dist);
+      dij.run(Base::_source);
     }
 
     ///Runs Dijkstra algorithm from the given node.