1.1 --- a/lemon/cost_scaling.h Thu Nov 12 23:45:15 2009 +0100
1.2 +++ b/lemon/cost_scaling.h Thu Nov 12 23:49:05 2009 +0100
1.3 @@ -40,9 +40,9 @@
1.4 ///
1.5 /// Default traits class of CostScaling algorithm.
1.6 /// \tparam GR Digraph type.
1.7 - /// \tparam V The value type used for flow amounts, capacity bounds
1.8 + /// \tparam V The number type used for flow amounts, capacity bounds
1.9 /// and supply values. By default it is \c int.
1.10 - /// \tparam C The value type used for costs and potentials.
1.11 + /// \tparam C The number type used for costs and potentials.
1.12 /// By default it is the same as \c V.
1.13 #ifdef DOXYGEN
1.14 template <typename GR, typename V = int, typename C = V>
1.15 @@ -101,12 +101,12 @@
1.16 /// specified, then default values will be used.
1.17 ///
1.18 /// \tparam GR The digraph type the algorithm runs on.
1.19 - /// \tparam V The value type used for flow amounts, capacity bounds
1.20 + /// \tparam V The number type used for flow amounts, capacity bounds
1.21 /// and supply values in the algorithm. By default it is \c int.
1.22 - /// \tparam C The value type used for costs and potentials in the
1.23 + /// \tparam C The number type used for costs and potentials in the
1.24 /// algorithm. By default it is the same as \c V.
1.25 ///
1.26 - /// \warning Both value types must be signed and all input data must
1.27 + /// \warning Both number types must be signed and all input data must
1.28 /// be integer.
1.29 /// \warning This algorithm does not support negative costs for such
1.30 /// arcs that have infinite upper bound.
1.31 @@ -157,7 +157,7 @@
1.32 OPTIMAL,
1.33 /// The digraph contains an arc of negative cost and infinite
1.34 /// upper bound. It means that the objective function is unbounded
1.35 - /// on that arc, however note that it could actually be bounded
1.36 + /// on that arc, however, note that it could actually be bounded
1.37 /// over the feasible flows, but this algroithm cannot handle
1.38 /// these cases.
1.39 UNBOUNDED
1.40 @@ -325,7 +325,7 @@
1.41 std::numeric_limits<Value>::infinity() :
1.42 std::numeric_limits<Value>::max())
1.43 {
1.44 - // Check the value types
1.45 + // Check the number types
1.46 LEMON_ASSERT(std::numeric_limits<Value>::is_signed,
1.47 "The flow type of CostScaling must be signed");
1.48 LEMON_ASSERT(std::numeric_limits<Cost>::is_signed,
1.49 @@ -433,7 +433,7 @@
1.50 /// This function sets the upper bounds (capacities) on the arcs.
1.51 /// If it is not used before calling \ref run(), the upper bounds
1.52 /// will be set to \ref INF on all arcs (i.e. the flow value will be
1.53 - /// unbounded from above on each arc).
1.54 + /// unbounded from above).
1.55 ///
1.56 /// \param map An arc map storing the upper bounds.
1.57 /// Its \c Value type must be convertible to the \c Value type
1.58 @@ -549,7 +549,7 @@
1.59 /// optimal flow and node potentials (primal and dual solutions),
1.60 /// \n \c UNBOUNDED if the digraph contains an arc of negative cost
1.61 /// and infinite upper bound. It means that the objective function
1.62 - /// is unbounded on that arc, however note that it could actually be
1.63 + /// is unbounded on that arc, however, note that it could actually be
1.64 /// bounded over the feasible flows, but this algroithm cannot handle
1.65 /// these cases.
1.66 ///
1.67 @@ -571,7 +571,7 @@
1.68 /// It is useful for multiple run() calls. If this function is not
1.69 /// used, all the parameters given before are kept for the next
1.70 /// \ref run() call.
1.71 - /// However the underlying digraph must not be modified after this
1.72 + /// However, the underlying digraph must not be modified after this
1.73 /// class have been constructed, since it copies and extends the graph.
1.74 ///
1.75 /// For example,