LEMON/LEMON-official Changeset - r937:aa8c9008b3de

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r937:aa8c9008b3de

« 935:2914b6

938:81f7e9 »

r937:aa8c9008b3de

Fri, 26 Feb 2010 23:53:09

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Better return type for cycleLength() functions (#179) in the min mean cycle algorithms. The original Value type is used instead of the LargeValue type, which is introduced for internal computations.

0 3 0

default

3 files changed with 6 insertions and 6 deletions:

lemon/hartmann_orlin.h

lemon/howard.h

lemon/karp.h

↑ Collapse diff ↑

lemon/hartmann_orlin.h

Show inline comments

@@ -384,50 +384,50 @@
 		      while ((v = _gr.source(e)) != u) {
 		        e = _data[v][--r].pred;
 		        _cycle_path->addFront(e);
 		        _best_length += _length[e];
 		        ++_best_size;
+		      }
 		      return true;
+		    }
 		    /// @}
 		    /// \name Query Functions
 		    /// The results of the algorithm can be obtained using these
 		    /// functions.\n
 		    /// The algorithm should be executed before using them.
 		    /// @{
 		    /// \brief Return the total length of the found cycle.
 		    ///
 		    /// This function returns the total length of the found cycle.
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.
 		    LargeValue cycleLength() const {
 		      return _best_length;
 		    Value cycleLength() const {
 		      return static_cast<Value>(_best_length);
+		    }
 		    /// \brief Return the number of arcs on the found cycle.
 		    ///
 		    /// This function returns the number of arcs on the found cycle.
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.
 		    int cycleArcNum() const {
 		      return _best_size;
+		    }
 		    /// \brief Return the mean length of the found cycle.
 		    ///
 		    /// This function returns the mean length of the found cycle.
 		    ///
 		    /// \note <tt>alg.cycleMean()</tt> is just a shortcut of the
 		    /// following code.
 		    /// \code
 		    ///   return static_cast<double>(alg.cycleLength()) / alg.cycleArcNum();
 		    /// \endcode
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.

lemon/howard.h

Show inline comments

@@ -363,50 +363,50 @@
 		      if (!_best_found) return false;
 		      _cycle_path->addBack(_policy[_best_node]);
 		      for ( Node v = _best_node;
 		            (v = _gr.target(_policy[v])) != _best_node; ) {
 		        _cycle_path->addBack(_policy[v]);
+		      }
 		      return true;
+		    }
 		    /// @}
 		    /// \name Query Functions
 		    /// The results of the algorithm can be obtained using these
 		    /// functions.\n
 		    /// The algorithm should be executed before using them.
 		    /// @{
 		    /// \brief Return the total length of the found cycle.
 		    ///
 		    /// This function returns the total length of the found cycle.
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.
 		    LargeValue cycleLength() const {
 		      return _best_length;
 		    Value cycleLength() const {
 		      return static_cast<Value>(_best_length);
+		    }
 		    /// \brief Return the number of arcs on the found cycle.
 		    ///
 		    /// This function returns the number of arcs on the found cycle.
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.
 		    int cycleArcNum() const {
 		      return _best_size;
+		    }
 		    /// \brief Return the mean length of the found cycle.
 		    ///
 		    /// This function returns the mean length of the found cycle.
 		    ///
 		    /// \note <tt>alg.cycleMean()</tt> is just a shortcut of the
 		    /// following code.
 		    /// \code
 		    ///   return static_cast<double>(alg.cycleLength()) / alg.cycleArcNum();
 		    /// \endcode
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.

lemon/karp.h

Show inline comments

@@ -371,50 +371,50 @@
 		      while ((v = _gr.source(e)) != u) {
 		        e = _data[v][--r].pred;
 		        _cycle_path->addFront(e);
 		        _cycle_length += _length[e];
 		        ++_cycle_size;
+		      }
 		      return true;
+		    }
 		    /// @}
 		    /// \name Query Functions
 		    /// The results of the algorithm can be obtained using these
 		    /// functions.\n
 		    /// The algorithm should be executed before using them.
 		    /// @{
 		    /// \brief Return the total length of the found cycle.
 		    ///
 		    /// This function returns the total length of the found cycle.
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.
 		    LargeValue cycleLength() const {
 		      return _cycle_length;
 		    Value cycleLength() const {
 		      return static_cast<Value>(_cycle_length);
+		    }
 		    /// \brief Return the number of arcs on the found cycle.
 		    ///
 		    /// This function returns the number of arcs on the found cycle.
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.
 		    int cycleArcNum() const {
 		      return _cycle_size;
+		    }
 		    /// \brief Return the mean length of the found cycle.
 		    ///
 		    /// This function returns the mean length of the found cycle.
 		    ///
 		    /// \note <tt>alg.cycleMean()</tt> is just a shortcut of the
 		    /// following code.
 		    /// \code
 		    ///   return static_cast<double>(alg.cycleLength()) / alg.cycleArcNum();
 		    /// \endcode
 		    ///
 		    /// \pre \ref run() or \ref findMinMean() must be called before
 		    /// using this function.

0 comments (0 inline)

RhodeCode

Login to your account