gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge bugfixes #323 to branch 1.1
0 1 0
merge 1.1
1 file changed with 3 insertions and 6 deletions:
↑ Collapse diff ↑
Show white space 12 line context
... ...
@@ -52,13 +52,13 @@
52 52
  /// algorithms.
53 53
  ///
54 54
  /// \tparam GR The digraph type the algorithm runs on.
55 55
  /// \tparam LEN The type of the length map.
56 56
  /// The default value is <tt>GR::ArcMap<int></tt>.
57 57
  ///
58
  /// \warning Length values should be \e non-negative \e integers.
58
  /// \warning Length values should be \e non-negative.
59 59
  ///
60 60
  /// \note For finding node-disjoint paths this algorithm can be used
61 61
  /// along with the \ref SplitNodes adaptor.
62 62
#ifdef DOXYGEN
63 63
  template <typename GR, typename LEN>
64 64
#else
... ...
@@ -249,16 +249,13 @@
249 249
    /// \param graph The digraph the algorithm runs on.
250 250
    /// \param length The length (cost) values of the arcs.
251 251
    Suurballe( const Digraph &graph,
252 252
               const LengthMap &length ) :
253 253
      _graph(graph), _length(length), _flow(0), _local_flow(false),
254 254
      _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
    {}
259 256

	
260 257
    /// Destructor.
261 258
    ~Suurballe() {
262 259
      if (_local_flow) delete _flow;
263 260
      if (_local_potential) delete _potential;
264 261
      delete _dijkstra;
... ...
@@ -517,13 +514,13 @@
517 514
    ///
518 515
    /// \param i The function returns the <tt>i</tt>-th path.
519 516
    /// \c i must be between \c 0 and <tt>%pathNum()-1</tt>.
520 517
    ///
521 518
    /// \pre \ref run() or \ref findPaths() must be called before using
522 519
    /// this function.
523
    Path path(int i) const {
520
    const Path& path(int i) const {
524 521
      return paths[i];
525 522
    }
526 523

	
527 524
    /// @}
528 525

	
529 526
  }; //class Suurballe
0 comments (0 inline)