COIN-OR::LEMON - Graph Library

Changeset 928:7bf1117178af in lemon


Ignore:
Timestamp:
03/03/10 17:00:08 (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/suurballe.h

    r843 r928  
    5656  /// The default value is <tt>GR::ArcMap<int></tt>.
    5757  ///
    58   /// \warning Length values should be \e non-negative \e integers.
     58  /// \warning Length values should be \e non-negative.
    5959  ///
    6060  /// \note For finding node-disjoint paths this algorithm can be used
     
    253253      _graph(graph), _length(length), _flow(0), _local_flow(false),
    254254      _potential(0), _local_potential(false), _pred(graph)
    255     {
    256       LEMON_ASSERT(std::numeric_limits<Length>::is_integer,
    257         "The length type of Suurballe must be integer");
    258     }
     255    {}
    259256
    260257    /// Destructor.
     
    521518    /// \pre \ref run() or \ref findPaths() must be called before using
    522519    /// this function.
    523     Path path(int i) const {
     520    const Path& path(int i) const {
    524521      return paths[i];
    525522    }
  • lemon/suurballe.h

    r925 r928  
    4646  /// Note that this problem is a special case of the \ref min_cost_flow
    4747  /// "minimum cost flow problem". This implementation is actually an
    48   /// efficient specialized version of the \ref CapacityScaling
    49   /// "Successive Shortest Path" algorithm directly for this problem.
     48  /// efficient specialized version of the Successive Shortest Path
     49  /// algorithm directly for this problem.
    5050  /// Therefore this class provides query functions for flow values and
    5151  /// node potentials (the dual solution) just like the minimum cost flow
Note: See TracChangeset for help on using the changeset viewer.