Changeset 1864:1788205e36af in lemon-0.x for lemon/johnson.h

Timestamp:

12/19/05 10:43:13 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2436

Message:

Fixing Bellman's name

File:

• lemon/johnson.h (modified) (4 diffs)

lemon/johnson.h

@@ -26 +26 @@
 #include <lemon/graph_utils.h>
 #include <lemon/dijkstra.h>
-#include <lemon/belmann_ford.h>
+#include <lemon/bellman_ford.h>
 #include <lemon/invalid.h>
 #include <lemon/error.h>
@@ -101 +101 @@
     typedef typename _LengthMap::Value Value;
 
-    /// \brief Operation traits for belmann-ford algorithm.
+    /// \brief Operation traits for bellman-ford algorithm.
     ///
     /// It defines the infinity type on the given Value type
@@ -545 +545 @@
     void start() {
 
-      typedef typename BelmannFord<Graph, LengthMap>::
+      typedef typename BellmanFord<Graph, LengthMap>::
       template DefOperationTraits<OperationTraits>::
       template DefPredMap<NullMap<Node, Edge> >::
-      Create BelmannFordType;
+      Create BellmanFordType;
       
-      BelmannFordType belmannford(*graph, *length);
+      BellmanFordType bellmanford(*graph, *length);
 
       NullMap<Node, Edge> predMap;
 
-      belmannford.predMap(predMap);
+      bellmanford.predMap(predMap);
       
-      belmannford.init(OperationTraits::zero());
-      belmannford.start();
-
-      shiftedRun(belmannford.distMap());
+      bellmanford.init(OperationTraits::zero());
+      bellmanford.start();
+
+      shiftedRun(bellmanford.distMap());
     }
 
@@ -572 +572 @@
     bool checkedStart() {
       
-      typedef typename BelmannFord<Graph, LengthMap>::
+      typedef typename BellmanFord<Graph, LengthMap>::
       template DefOperationTraits<OperationTraits>::
       template DefPredMap<NullMap<Node, Edge> >::
-      Create BelmannFordType;
-
-      BelmannFordType belmannford(*graph, *length);
+      Create BellmanFordType;
+
+      BellmanFordType bellmanford(*graph, *length);
 
       NullMap<Node, Edge> predMap;
 
-      belmannford.predMap(predMap);
+      bellmanford.predMap(predMap);
       
-      belmannford.init(OperationTraits::zero());
-      if (!belmannford.checkedStart()) return false;
-
-      shiftedRun(belmannford.distMap());
+      bellmanford.init(OperationTraits::zero());
+      if (!bellmanford.checkedStart()) return false;
+
+      shiftedRun(bellmanford.distMap());
       return true;
     }