[Lemon-commits] Alpar Juttner: Merge bugfixes #323 to branch 1.1

Lemon HG hg at lemon.cs.elte.hu
Wed Mar 3 17:14:29 CET 2010


details:   http://lemon.cs.elte.hu/hg/lemon/rev/7bf1117178af
changeset: 929:7bf1117178af
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Mar 03 16:00:08 2010 +0000
description:
	Merge bugfixes #323 to branch 1.1

diffstat:

 lemon/suurballe.h |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (33 lines):

diff --git a/lemon/suurballe.h b/lemon/suurballe.h
--- a/lemon/suurballe.h
+++ b/lemon/suurballe.h
@@ -55,7 +55,7 @@
   /// \tparam LEN The type of the length map.
   /// 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
   /// along with the \ref SplitNodes adaptor.
@@ -252,10 +252,7 @@
                const LengthMap &length ) :
       _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.
     ~Suurballe() {
@@ -520,7 +517,7 @@
     ///
     /// \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];
     }
 



More information about the Lemon-commits mailing list