Changes in lemon/dijkstra.h [525:9605e051942f:463:88ed40ad0d4f] in lemon

File:

• lemon/dijkstra.h (modified) (17 diffs)

lemon/dijkstra.h

@@ -74 +74 @@
     typedef typename LM::Value Value;
 
-    /// Operation traits for %Dijkstra algorithm.
+    /// Operation traits for Dijkstra algorithm.
 
     /// This class defines the operations that are used in the algorithm.
@@ -85 +85 @@
     /// Usually it is \c Digraph::NodeMap<int>.
     typedef typename Digraph::template NodeMap<int> HeapCrossRef;
-    ///Instantiates a \c HeapCrossRef.
+    ///Instantiates a \ref HeapCrossRef.
 
     ///This function instantiates a \ref HeapCrossRef.
@@ -95 +95 @@
     }
 
-    ///The heap type used by the %Dijkstra algorithm.
+    ///The heap type used by the Dijkstra algorithm.
 
     ///The heap type used by the Dijkstra algorithm.
@@ -102 +102 @@
     ///\sa Dijkstra
     typedef BinHeap<typename LM::Value, HeapCrossRef, std::less<Value> > Heap;
-    ///Instantiates a \c Heap.
+    ///Instantiates a \ref Heap.
 
     ///This function instantiates a \ref Heap.
@@ -117 +117 @@
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
     typedef typename Digraph::template NodeMap<typename Digraph::Arc> PredMap;
-    ///Instantiates a \c PredMap.
-
-    ///This function instantiates a \ref PredMap.
+    ///Instantiates a PredMap.
+
+    ///This function instantiates a PredMap.
     ///\param g is the digraph, to which we would like to define the
-    ///\ref PredMap.
+    ///PredMap.
     static PredMap *createPredMap(const Digraph &g)
     {
@@ -133 +133 @@
     ///By default it is a NullMap.
     typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
-    ///Instantiates a \c ProcessedMap.
-
-    ///This function instantiates a \ref ProcessedMap.
+    ///Instantiates a ProcessedMap.
+
+    ///This function instantiates a ProcessedMap.
     ///\param g is the digraph, to which
-    ///we would like to define the \ref ProcessedMap.
+    ///we would like to define the ProcessedMap
 #ifdef DOXYGEN
     static ProcessedMap *createProcessedMap(const Digraph &g)
@@ -152 +152 @@
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
     typedef typename Digraph::template NodeMap<typename LM::Value> DistMap;
-    ///Instantiates a \c DistMap.
-
-    ///This function instantiates a \ref DistMap.
+    ///Instantiates a DistMap.
+
+    ///This function instantiates a DistMap.
     ///\param g is the digraph, to which we would like to define
-    ///the \ref DistMap.
+    ///the DistMap
     static DistMap *createDistMap(const Digraph &g)
     {
@@ -217 +217 @@
     ///The heap type used by the algorithm.
     typedef typename TR::Heap Heap;
-    ///\brief The \ref DijkstraDefaultOperationTraits "operation traits class"
-    ///of the algorithm.
+    ///The operation traits class.
     typedef typename TR::OperationTraits OperationTraits;
 
@@ -234 +233 @@
     const Digraph *G;
     //Pointer to the length map.
-    const LengthMap *_length;
+    const LengthMap *length;
     //Pointer to the map of predecessors arcs.
     PredMap *_pred;
@@ -299 +298 @@
     };
     ///\brief \ref named-templ-param "Named parameter" for setting
-    ///\c PredMap type.
+    ///PredMap type.
     ///
     ///\ref named-templ-param "Named parameter" for setting
-    ///\c PredMap type.
+    ///PredMap type.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
     template <class T>
@@ -320 +319 @@
     };
     ///\brief \ref named-templ-param "Named parameter" for setting
-    ///\c DistMap type.
+    ///DistMap type.
     ///
     ///\ref named-templ-param "Named parameter" for setting
-    ///\c DistMap type.
+    ///DistMap type.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
     template <class T>
@@ -341 +340 @@
     };
     ///\brief \ref named-templ-param "Named parameter" for setting
-    ///\c ProcessedMap type.
+    ///ProcessedMap type.
     ///
     ///\ref named-templ-param "Named parameter" for setting
-    ///\c ProcessedMap type.
+    ///ProcessedMap type.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
     template <class T>
@@ -360 +359 @@
     };
     ///\brief \ref named-templ-param "Named parameter" for setting
-    ///\c ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
+    ///ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
     ///
     ///\ref named-templ-param "Named parameter" for setting
-    ///\c ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
+    ///ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
     ///If you don't set it explicitly, it will be automatically allocated.
     struct SetStandardProcessedMap
@@ -441 +440 @@
     ///
     ///\ref named-templ-param "Named parameter" for setting
-    ///\c OperationTraits type.
+    ///\ref OperationTraits type.
     template <class T>
     struct SetOperationTraits
@@ -460 +459 @@
 
     ///Constructor.
-    ///\param g The digraph the algorithm runs on.
-    ///\param length The length map used by the algorithm.
-    Dijkstra(const Digraph& g, const LengthMap& length) :
-      G(&g), _length(&length),
+    ///\param _g The digraph the algorithm runs on.
+    ///\param _length The length map used by the algorithm.
+    Dijkstra(const Digraph& _g, const LengthMap& _length) :
+      G(&_g), length(&_length),
       _pred(NULL), local_pred(false),
       _dist(NULL), local_dist(false),
@@ -487 +486 @@
     Dijkstra &lengthMap(const LengthMap &m)
     {
-      _length = &m;
+      length = &m;
       return *this;
     }
@@ -640 +639 @@
         switch(_heap->state(w)) {
         case Heap::PRE_HEAP:
-          _heap->push(w,OperationTraits::plus(oldvalue, (*_length)[e]));
+          _heap->push(w,OperationTraits::plus(oldvalue, (*length)[e]));
           _pred->set(w,e);
           break;
         case Heap::IN_HEAP:
           {
-            Value newvalue = OperationTraits::plus(oldvalue, (*_length)[e]);
+            Value newvalue = OperationTraits::plus(oldvalue, (*length)[e]);
             if ( OperationTraits::less(newvalue, (*_heap)[w]) ) {
               _heap->decrease(w, newvalue);