Merge bugfixes #323 to branch 1.1 1.1
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 03 Mar 2010 16:00:08 +0000
branch1.1
changeset 7197bf1117178af
parent 716 2f9d9bcc1867
parent 718 30c77d1c0cba
child 720 86a880ba752d
Merge bugfixes #323 to branch 1.1
lemon/suurballe.h
     1.1 --- a/lemon/suurballe.h	Fri Feb 26 17:08:30 2010 +0100
     1.2 +++ b/lemon/suurballe.h	Wed Mar 03 16:00:08 2010 +0000
     1.3 @@ -55,7 +55,7 @@
     1.4    /// \tparam LEN The type of the length map.
     1.5    /// The default value is <tt>GR::ArcMap<int></tt>.
     1.6    ///
     1.7 -  /// \warning Length values should be \e non-negative \e integers.
     1.8 +  /// \warning Length values should be \e non-negative.
     1.9    ///
    1.10    /// \note For finding node-disjoint paths this algorithm can be used
    1.11    /// along with the \ref SplitNodes adaptor.
    1.12 @@ -252,10 +252,7 @@
    1.13                 const LengthMap &length ) :
    1.14        _graph(graph), _length(length), _flow(0), _local_flow(false),
    1.15        _potential(0), _local_potential(false), _pred(graph)
    1.16 -    {
    1.17 -      LEMON_ASSERT(std::numeric_limits<Length>::is_integer,
    1.18 -        "The length type of Suurballe must be integer");
    1.19 -    }
    1.20 +    {}
    1.21  
    1.22      /// Destructor.
    1.23      ~Suurballe() {
    1.24 @@ -520,7 +517,7 @@
    1.25      ///
    1.26      /// \pre \ref run() or \ref findPaths() must be called before using
    1.27      /// this function.
    1.28 -    Path path(int i) const {
    1.29 +    const Path& path(int i) const {
    1.30        return paths[i];
    1.31      }
    1.32