1.1 --- a/lemon/cost_scaling.h Thu Oct 17 09:29:37 2013 +0200
1.2 +++ b/lemon/cost_scaling.h Thu Oct 17 09:30:57 2013 +0200
1.3 @@ -251,7 +251,7 @@
1.4 int _root;
1.5
1.6 // Parameters of the problem
1.7 - bool _have_lower;
1.8 + bool _has_lower;
1.9 Value _sum_supply;
1.10 int _sup_node_num;
1.11
1.12 @@ -367,7 +367,7 @@
1.13 /// \return <tt>(*this)</tt>
1.14 template <typename LowerMap>
1.15 CostScaling& 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_idf[a]] = map[a];
1.20 }
1.21 @@ -562,7 +562,7 @@
1.22 _scost[j] = 0;
1.23 _scost[_reverse[j]] = 0;
1.24 }
1.25 - _have_lower = false;
1.26 + _has_lower = false;
1.27 return *this;
1.28 }
1.29
1.30 @@ -774,7 +774,7 @@
1.31 // Remove infinite upper bounds and check negative arcs
1.32 const Value MAX = std::numeric_limits<Value>::max();
1.33 int last_out;
1.34 - if (_have_lower) {
1.35 + if (_has_lower) {
1.36 for (int i = 0; i != _root; ++i) {
1.37 last_out = _first_out[i+1];
1.38 for (int j = _first_out[i]; j != last_out; ++j) {
1.39 @@ -831,7 +831,7 @@
1.40 for (NodeIt n(_graph); n != INVALID; ++n) {
1.41 sup[n] = _supply[_node_id[n]];
1.42 }
1.43 - if (_have_lower) {
1.44 + if (_has_lower) {
1.45 for (ArcIt a(_graph); a != INVALID; ++a) {
1.46 int j = _arc_idf[a];
1.47 Value c = _lower[j];
1.48 @@ -985,7 +985,7 @@
1.49 }
1.50
1.51 // Handle non-zero lower bounds
1.52 - if (_have_lower) {
1.53 + if (_has_lower) {
1.54 int limit = _first_out[_root];
1.55 for (int j = 0; j != limit; ++j) {
1.56 if (_forward[j]) _res_cap[_reverse[j]] += _lower[j];