1.1 --- a/lemon/johnson.h	Sun Dec 18 03:01:53 2005 +0000
     1.2 +++ b/lemon/johnson.h	Mon Dec 19 09:43:13 2005 +0000
     1.3 @@ -25,7 +25,7 @@
     1.4  #include <lemon/list_graph.h>
     1.5  #include <lemon/graph_utils.h>
     1.6  #include <lemon/dijkstra.h>
     1.7 -#include <lemon/belmann_ford.h>
     1.8 +#include <lemon/bellman_ford.h>
     1.9  #include <lemon/invalid.h>
    1.10  #include <lemon/error.h>
    1.11  #include <lemon/maps.h>
    1.12 @@ -100,7 +100,7 @@
    1.13      // The type of the length of the edges.
    1.14      typedef typename _LengthMap::Value Value;
    1.15  
    1.16 -    /// \brief Operation traits for belmann-ford algorithm.
    1.17 +    /// \brief Operation traits for bellman-ford algorithm.
    1.18      ///
    1.19      /// It defines the infinity type on the given Value type
    1.20      /// and the used operation.
    1.21 @@ -544,21 +544,21 @@
    1.22      /// - The distance between each node pairs.
    1.23      void start() {
    1.24  
    1.25 -      typedef typename BelmannFord<Graph, LengthMap>::
    1.26 +      typedef typename BellmanFord<Graph, LengthMap>::
    1.27        template DefOperationTraits<OperationTraits>::
    1.28        template DefPredMap<NullMap<Node, Edge> >::
    1.29 -      Create BelmannFordType;
    1.30 +      Create BellmanFordType;
    1.31        
    1.32 -      BelmannFordType belmannford(*graph, *length);
    1.33 +      BellmanFordType bellmanford(*graph, *length);
    1.34  
    1.35        NullMap<Node, Edge> predMap;
    1.36  
    1.37 -      belmannford.predMap(predMap);
    1.38 +      bellmanford.predMap(predMap);
    1.39        
    1.40 -      belmannford.init(OperationTraits::zero());
    1.41 -      belmannford.start();
    1.42 +      bellmanford.init(OperationTraits::zero());
    1.43 +      bellmanford.start();
    1.44  
    1.45 -      shiftedRun(belmannford.distMap());
    1.46 +      shiftedRun(bellmanford.distMap());
    1.47      }
    1.48  
    1.49      /// \brief Executes the algorithm and checks the negatvie cycles.
    1.50 @@ -571,21 +571,21 @@
    1.51      /// - The distance between each node pairs.
    1.52      bool checkedStart() {
    1.53        
    1.54 -      typedef typename BelmannFord<Graph, LengthMap>::
    1.55 +      typedef typename BellmanFord<Graph, LengthMap>::
    1.56        template DefOperationTraits<OperationTraits>::
    1.57        template DefPredMap<NullMap<Node, Edge> >::
    1.58 -      Create BelmannFordType;
    1.59 +      Create BellmanFordType;
    1.60  
    1.61 -      BelmannFordType belmannford(*graph, *length);
    1.62 +      BellmanFordType bellmanford(*graph, *length);
    1.63  
    1.64        NullMap<Node, Edge> predMap;
    1.65  
    1.66 -      belmannford.predMap(predMap);
    1.67 +      bellmanford.predMap(predMap);
    1.68        
    1.69 -      belmannford.init(OperationTraits::zero());
    1.70 -      if (!belmannford.checkedStart()) return false;
    1.71 +      bellmanford.init(OperationTraits::zero());
    1.72 +      if (!bellmanford.checkedStart()) return false;
    1.73  
    1.74 -      shiftedRun(belmannford.distMap());
    1.75 +      shiftedRun(bellmanford.distMap());
    1.76        return true;
    1.77      }
    1.78