diff -r fe80a8145653 -r 4b1b378823dc lemon/capacity_scaling.h --- a/lemon/capacity_scaling.h Thu Nov 12 23:45:15 2009 +0100 +++ b/lemon/capacity_scaling.h Thu Nov 12 23:49:05 2009 +0100 @@ -35,9 +35,9 @@ /// /// Default traits class of CapacityScaling algorithm. /// \tparam GR Digraph type. - /// \tparam V The value type used for flow amounts, capacity bounds + /// \tparam V The number type used for flow amounts, capacity bounds /// and supply values. By default it is \c int. - /// \tparam C The value type used for costs and potentials. + /// \tparam C The number type used for costs and potentials. /// By default it is the same as \c V. template struct CapacityScalingDefaultTraits @@ -75,12 +75,12 @@ /// specified, then default values will be used. /// /// \tparam GR The digraph type the algorithm runs on. - /// \tparam V The value type used for flow amounts, capacity bounds + /// \tparam V The number type used for flow amounts, capacity bounds /// and supply values in the algorithm. By default it is \c int. - /// \tparam C The value type used for costs and potentials in the + /// \tparam C The number type used for costs and potentials in the /// algorithm. By default it is the same as \c V. /// - /// \warning Both value types must be signed and all input data must + /// \warning Both number types must be signed and all input data must /// be integer. /// \warning This algorithm does not support negative costs for such /// arcs that have infinite upper bound. @@ -122,7 +122,7 @@ OPTIMAL, /// The digraph contains an arc of negative cost and infinite /// upper bound. It means that the objective function is unbounded - /// on that arc, however note that it could actually be bounded + /// on that arc, however, note that it could actually be bounded /// over the feasible flows, but this algroithm cannot handle /// these cases. UNBOUNDED @@ -307,7 +307,7 @@ std::numeric_limits::infinity() : std::numeric_limits::max()) { - // Check the value types + // Check the number types LEMON_ASSERT(std::numeric_limits::is_signed, "The flow type of CapacityScaling must be signed"); LEMON_ASSERT(std::numeric_limits::is_signed, @@ -411,7 +411,7 @@ /// This function sets the upper bounds (capacities) on the arcs. /// If it is not used before calling \ref run(), the upper bounds /// will be set to \ref INF on all arcs (i.e. the flow value will be - /// unbounded from above on each arc). + /// unbounded from above). /// /// \param map An arc map storing the upper bounds. /// Its \c Value type must be convertible to the \c Value type @@ -514,7 +514,7 @@ /// that have been given are kept for the next call, unless /// \ref reset() is called, thus only the modified parameters /// have to be set again. See \ref reset() for examples. - /// However the underlying digraph must not be modified after this + /// However, the underlying digraph must not be modified after this /// class have been constructed, since it copies and extends the graph. /// /// \param factor The capacity scaling factor. It must be larger than @@ -527,7 +527,7 @@ /// optimal flow and node potentials (primal and dual solutions), /// \n \c UNBOUNDED if the digraph contains an arc of negative cost /// and infinite upper bound. It means that the objective function - /// is unbounded on that arc, however note that it could actually be + /// is unbounded on that arc, however, note that it could actually be /// bounded over the feasible flows, but this algroithm cannot handle /// these cases. ///