diff -r c20bcf71efe3 -r b217fc69f913 src/lemon/dijkstra.h --- a/src/lemon/dijkstra.h Tue Feb 15 15:00:31 2005 +0000 +++ b/src/lemon/dijkstra.h Wed Feb 16 16:17:30 2005 +0000 @@ -30,9 +30,7 @@ namespace lemon { -/// \addtogroup flowalgs -/// @{ - + ///Default traits class of Dijkstra class. ///Default traits class of Dijkstra class. @@ -129,6 +127,7 @@ ///%Dijkstra algorithm class. + /// \ingroup flowalgs ///This class provides an efficient implementation of %Dijkstra algorithm. ///The edge lengths are passed to the algorithm using a ///\ref concept::ReadMap "ReadMap", @@ -496,7 +495,7 @@ if(_heap.state(s) != Heap::IN_HEAP) _heap.push(s,dst); } - void processNode() + void processNextNode() { Node v=_heap.top(); Value oldvalue=_heap[v]; @@ -540,7 +539,7 @@ /// void start() { - while ( !_heap.empty() ) processNode(); + while ( !_heap.empty() ) processNextNode(); } ///Executes the algorithm until \c dest is reached. @@ -559,7 +558,7 @@ /// void start(Node dest) { - while ( !_heap.empty() && _heap.top()!=dest ) processNode(); + while ( !_heap.empty() && _heap.top()!=dest ) processNextNode(); if ( _heap.top()==dest ) finalizeNodeData(_heap.top()); } @@ -575,7 +574,7 @@ template void start(const NM &nm) { - while ( !_heap.empty() && !mn[_heap.top()] ) processNode(); + while ( !_heap.empty() && !mn[_heap.top()] ) processNextNode(); if ( !_heap.empty() ) finalizeNodeData(_heap.top()); } @@ -695,8 +694,10 @@ /// Default traits used by \ref DijkstraWizard - /// To make it easier to use Dijkstra algorithm we have created a wizard class. - /// This \ref DijkstraWizard class needs default traits, as well as the \ref Dijkstra class. + /// To make it easier to use Dijkstra algorithm + ///we have created a wizard class. + /// This \ref DijkstraWizard class needs default traits, + ///as well as the \ref Dijkstra class. /// The \ref DijkstraWizardBase is a class to be the default traits of the /// \ref DijkstraWizard class. template @@ -744,15 +745,19 @@ /// A class to make easier the usage of Dijkstra algorithm + /// \ingroup flowalgs /// This class is created to make it easier to use Dijkstra algorithm. /// It uses the functions and features of the plain \ref Dijkstra, - /// but it is much more simple to use it. + /// but it is much simpler to use it. /// /// Simplicity means that the way to change the types defined /// in the traits class is based on functions that returns the new class - /// and not on templatable built-in classes. When using the plain \ref Dijkstra - /// the new class with the modified type comes from the original class by using the :: - /// operator. In the case of \ref DijkstraWizard only a function have to be called and it will + /// and not on templatable built-in classes. + /// When using the plain \ref Dijkstra + /// the new class with the modified type comes from + /// the original class by using the :: + /// operator. In the case of \ref DijkstraWizard only + /// a function have to be called and it will /// return the needed class. /// /// It does not have own \ref run method. When its \ref run method is called @@ -898,6 +903,7 @@ ///\e + /// \ingroup flowalgs ///\todo Please document... /// template