Merge bugfix #307 1.1
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 31 Aug 2009 07:05:13 +0200
branch1.1
changeset 69131a389202e65
parent 689 4f9219730eb4
parent 690 1f08e846df29
child 692 78b7231f0b2e
Merge bugfix #307
     1.1 --- a/lemon/circulation.h	Thu Aug 20 22:45:40 2009 +0200
     1.2 +++ b/lemon/circulation.h	Mon Aug 31 07:05:13 2009 +0200
     1.3 @@ -453,7 +453,7 @@
     1.4      /// \brief Sets the tolerance used by algorithm.
     1.5      ///
     1.6      /// Sets the tolerance used by algorithm.
     1.7 -    Circulation& tolerance(const Tolerance& tolerance) const {
     1.8 +    Circulation& tolerance(const Tolerance& tolerance) {
     1.9        _tol = tolerance;
    1.10        return *this;
    1.11      }
    1.12 @@ -462,7 +462,7 @@
    1.13      ///
    1.14      /// Returns a const reference to the tolerance.
    1.15      const Tolerance& tolerance() const {
    1.16 -      return tolerance;
    1.17 +      return _tol;
    1.18      }
    1.19  
    1.20      /// \name Execution Control
     2.1 --- a/lemon/preflow.h	Thu Aug 20 22:45:40 2009 +0200
     2.2 +++ b/lemon/preflow.h	Mon Aug 31 07:05:13 2009 +0200
     2.3 @@ -374,7 +374,7 @@
     2.4      /// \brief Sets the tolerance used by algorithm.
     2.5      ///
     2.6      /// Sets the tolerance used by algorithm.
     2.7 -    Preflow& tolerance(const Tolerance& tolerance) const {
     2.8 +    Preflow& tolerance(const Tolerance& tolerance) {
     2.9        _tolerance = tolerance;
    2.10        return *this;
    2.11      }
    2.12 @@ -383,7 +383,7 @@
    2.13      ///
    2.14      /// Returns a const reference to the tolerance.
    2.15      const Tolerance& tolerance() const {
    2.16 -      return tolerance;
    2.17 +      return _tolerance;
    2.18      }
    2.19  
    2.20      /// \name Execution Control