1.1 --- a/lemon/floyd_warshall.h	Wed Nov 02 15:26:04 2005 +0000
     1.2 +++ b/lemon/floyd_warshall.h	Wed Nov 02 15:27:38 2005 +0000
     1.3 @@ -142,20 +142,20 @@
     1.4  
     1.5    };
     1.6    
     1.7 -  /// \brief FloydWarshall algorithm class.
     1.8 +  /// \brief %FloydWarshall algorithm class.
     1.9    ///
    1.10    /// \ingroup flowalgs
    1.11 -  /// This class provides an efficient implementation of \c FloydWarshall 
    1.12 +  /// This class provides an efficient implementation of \c Floyd-Warshall 
    1.13    /// algorithm. The edge lengths are passed to the algorithm using a
    1.14    /// \ref concept::ReadMap "ReadMap", so it is easy to change it to any 
    1.15    /// kind of length.
    1.16    ///
    1.17    /// The algorithm solves the shortest path problem for each pairs
    1.18    /// of node when the edges can have negative length but the graph should
    1.19 -  /// not contain circle with negative sum of length. If we can assume
    1.20 +  /// not contain cycles with negative sum of length. If we can assume
    1.21    /// that all edge is non-negative in the graph then the dijkstra algorithm
    1.22    /// should be used from each node rather and if the graph is sparse and
    1.23 -  /// there are negative circles then the johson algorithm.
    1.24 +  /// there are negative circles then the johnson algorithm.
    1.25    ///
    1.26    /// The complexity of this algorithm is O(n^3 + e).
    1.27    ///
    1.28 @@ -428,10 +428,10 @@
    1.29        }
    1.30      }
    1.31  
    1.32 -    /// \brief Executes the algorithm and checks the negative circles.
    1.33 +    /// \brief Executes the algorithm and checks the negative cycles.
    1.34      ///
    1.35      /// This method runs the %FloydWarshall algorithm in order to compute 
    1.36 -    /// the shortest path to each node pairs. If there is a negative circle 
    1.37 +    /// the shortest path to each node pairs. If there is a negative cycle 
    1.38      /// in the graph it gives back false. 
    1.39      /// The algorithm computes 
    1.40      /// - The shortest path tree for each node.