1.1 --- a/lemon/capacity_scaling.h	Wed Mar 17 12:35:52 2010 +0100
     1.2 +++ b/lemon/capacity_scaling.h	Sat Mar 06 14:35:12 2010 +0000
     1.3 @@ -1,8 +1,8 @@
     1.4 -/* -*- C++ -*-
     1.5 +/* -*- mode: C++; indent-tabs-mode: nil; -*-
     1.6   *
     1.7 - * This file is a part of LEMON, a generic C++ optimization library
     1.8 + * This file is a part of LEMON, a generic C++ optimization library.
     1.9   *
    1.10 - * Copyright (C) 2003-2008
    1.11 + * Copyright (C) 2003-2010
    1.12   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    1.13   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    1.14   *
    1.15 @@ -133,7 +133,7 @@
    1.16        /// these cases.
    1.17        UNBOUNDED
    1.18      };
    1.19 -  
    1.20 +
    1.21    private:
    1.22  
    1.23      TEMPLATE_DIGRAPH_TYPEDEFS(GR);
    1.24 @@ -184,7 +184,7 @@
    1.25      IntVector _pred;
    1.26  
    1.27    public:
    1.28 -  
    1.29 +
    1.30      /// \brief Constant for infinite upper bounds (capacities).
    1.31      ///
    1.32      /// Constant for infinite upper bounds (capacities).
    1.33 @@ -211,10 +211,10 @@
    1.34        const ValueVector &_excess;
    1.35        CostVector &_pi;
    1.36        IntVector &_pred;
    1.37 -      
    1.38 +
    1.39        IntVector _proc_nodes;
    1.40        CostVector _dist;
    1.41 -      
    1.42 +
    1.43      public:
    1.44  
    1.45        ResidualDijkstra(CapacityScaling& cs) :
    1.46 @@ -439,7 +439,7 @@
    1.47        _supply[_node_id[t]] = -k;
    1.48        return *this;
    1.49      }
    1.50 -    
    1.51 +
    1.52      /// @}
    1.53  
    1.54      /// \name Execution control
    1.55 @@ -575,7 +575,7 @@
    1.56        _upper.resize(_res_arc_num);
    1.57        _cost.resize(_res_arc_num);
    1.58        _supply.resize(_node_num);
    1.59 -      
    1.60 +
    1.61        _res_cap.resize(_res_arc_num);
    1.62        _pi.resize(_node_num);
    1.63        _excess.resize(_node_num);
    1.64 @@ -619,7 +619,7 @@
    1.65          _reverse[fi] = bi;
    1.66          _reverse[bi] = fi;
    1.67        }
    1.68 -      
    1.69 +
    1.70        // Reset parameters
    1.71        resetParams();
    1.72        return *this;
    1.73 @@ -728,7 +728,7 @@
    1.74          _sum_supply += _supply[i];
    1.75        }
    1.76        if (_sum_supply > 0) return INFEASIBLE;
    1.77 -      
    1.78 +
    1.79        // Initialize vectors
    1.80        for (int i = 0; i != _root; ++i) {
    1.81          _pi[i] = 0;
    1.82 @@ -776,7 +776,7 @@
    1.83            }
    1.84          }
    1.85        }
    1.86 -      
    1.87 +
    1.88        // Handle GEQ supply type
    1.89        if (_sum_supply < 0) {
    1.90          _pi[_root] = 0;
    1.91 @@ -844,9 +844,9 @@
    1.92        if (_sum_supply < 0 || pr > 0) {
    1.93          for (int i = 0; i != _node_num; ++i) {
    1.94            _pi[i] -= pr;
    1.95 -        }        
    1.96 +        }
    1.97        }
    1.98 -      
    1.99 +
   1.100        return pt;
   1.101      }
   1.102