Changeset 922:9312d6c89d02 in lemon-main for lemon/capacity_scaling.h

Timestamp:

01/10/11 09:34:50 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

921:140c953ad5d1 (diff), 920:745312f9b441 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• lemon/capacity_scaling.h (modified) (1 diff)
• lemon/capacity_scaling.h (modified) (2 diffs)

lemon/capacity_scaling.h

@@ -87 +87 @@
   /// consider to use the named template parameters instead.
   ///
-  /// \warning Both number types must be signed and all input data must
+  /// \warning Both \c V and \c C must be signed number types.
+  /// \warning All input data (capacities, supply values, and costs) must
   /// be integer.
   /// \warning This algorithm does not support negative costs for

lemon/capacity_scaling.h

@@ -90 +90 @@
   /// \warning All input data (capacities, supply values, and costs) must
   /// be integer.
-  /// \warning This algorithm does not support negative costs for such
-  /// arcs that have infinite upper bound.
+  /// \warning This algorithm does not support negative costs for
+  /// arcs having infinite upper bound.
 #ifdef DOXYGEN
   template <typename GR, typename V, typename C, typename TR>
@@ -424 +424 @@
     ///
     /// Using this function has the same effect as using \ref supplyMap()
-    /// with such a map in which \c k is assigned to \c s, \c -k is
+    /// with a map in which \c k is assigned to \c s, \c -k is
     /// assigned to \c t and all other nodes have zero supply value.
     ///