Changeset 928:7bf1117178af in lemon

Timestamp:

03/03/10 17:00:08 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.1

Parents:

913:2f9d9bcc1867 (diff), 925:30c77d1c0cba (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 bugfixes #323 to branch 1.1

Files:

• lemon/suurballe.h (modified) (3 diffs)
• lemon/suurballe.h (modified) (1 diff)

lemon/suurballe.h

@@ -56 +56 @@
   /// The default value is <tt>GR::ArcMap<int></tt>.
   ///
-  /// \warning Length values should be \e non-negative \e integers.
+  /// \warning Length values should be \e non-negative.
   ///
   /// \note For finding node-disjoint paths this algorithm can be used
@@ -253 +253 @@
       _graph(graph), _length(length), _flow(0), _local_flow(false),
       _potential(0), _local_potential(false), _pred(graph)
-    {
-      LEMON_ASSERT(std::numeric_limits<Length>::is_integer,
-        "The length type of Suurballe must be integer");
-    }
+    {}
 
     /// Destructor.
@@ -521 +518 @@
     /// \pre \ref run() or \ref findPaths() must be called before using
     /// this function.
-    Path path(int i) const {
+    const Path& path(int i) const {
       return paths[i];
     }

lemon/suurballe.h

@@ -46 +46 @@
   /// Note that this problem is a special case of the \ref min_cost_flow
   /// "minimum cost flow problem". This implementation is actually an
-  /// efficient specialized version of the \ref CapacityScaling
-  /// "Successive Shortest Path" algorithm directly for this problem.
+  /// efficient specialized version of the Successive Shortest Path
+  /// algorithm directly for this problem.
   /// Therefore this class provides query functions for flow values and
   /// node potentials (the dual solution) just like the minimum cost flow