lemon/network_simplex.h
branch1.3
changeset 1112 b6bad215bccd
parent 1092 dceba191c00d
parent 1110 c0c2f5c87aa6
child 1130 ce1533650f7d
     1.1 --- a/lemon/network_simplex.h	Wed Sep 25 11:32:41 2013 +0200
     1.2 +++ b/lemon/network_simplex.h	Thu Oct 17 15:09:30 2013 +0200
     1.3 @@ -198,7 +198,7 @@
     1.4      int _search_arc_num;
     1.5  
     1.6      // Parameters of the problem
     1.7 -    bool _have_lower;
     1.8 +    bool _has_lower;
     1.9      SupplyType _stype;
    1.10      Value _sum_supply;
    1.11  
    1.12 @@ -682,7 +682,7 @@
    1.13      /// \return <tt>(*this)</tt>
    1.14      template <typename LowerMap>
    1.15      NetworkSimplex& lowerMap(const LowerMap& map) {
    1.16 -      _have_lower = true;
    1.17 +      _has_lower = true;
    1.18        for (ArcIt a(_graph); a != INVALID; ++a) {
    1.19          _lower[_arc_id[a]] = map[a];
    1.20        }
    1.21 @@ -879,7 +879,7 @@
    1.22          _upper[i] = INF;
    1.23          _cost[i] = 1;
    1.24        }
    1.25 -      _have_lower = false;
    1.26 +      _has_lower = false;
    1.27        _stype = GEQ;
    1.28        return *this;
    1.29      }
    1.30 @@ -1072,7 +1072,7 @@
    1.31            "Upper bounds must be greater or equal to the lower bounds");
    1.32  
    1.33        // Remove non-zero lower bounds
    1.34 -      if (_have_lower) {
    1.35 +      if (_has_lower) {
    1.36          for (int i = 0; i != _arc_num; ++i) {
    1.37            Value c = _lower[i];
    1.38            if (c >= 0) {
    1.39 @@ -1235,7 +1235,7 @@
    1.40        return true;
    1.41      }
    1.42  
    1.43 -    // Check if the upper bound is greater or equal to the lower bound
    1.44 +    // Check if the upper bound is greater than or equal to the lower bound
    1.45      // on each arc.
    1.46      bool checkBoundMaps() {
    1.47        for (int j = 0; j != _arc_num; ++j) {
    1.48 @@ -1612,7 +1612,7 @@
    1.49        }
    1.50  
    1.51        // Transform the solution and the supply map to the original form
    1.52 -      if (_have_lower) {
    1.53 +      if (_has_lower) {
    1.54          for (int i = 0; i != _arc_num; ++i) {
    1.55            Value c = _lower[i];
    1.56            if (c != 0) {