diff -r 7f6e2bd76654 -r 141f9c0db4a3 lemon/capacity_scaling.h --- a/lemon/capacity_scaling.h Wed Mar 17 12:35:52 2010 +0100 +++ b/lemon/capacity_scaling.h Sat Mar 06 14:35:12 2010 +0000 @@ -1,8 +1,8 @@ -/* -*- C++ -*- +/* -*- mode: C++; indent-tabs-mode: nil; -*- * - * This file is a part of LEMON, a generic C++ optimization library + * This file is a part of LEMON, a generic C++ optimization library. * - * Copyright (C) 2003-2008 + * Copyright (C) 2003-2010 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport * (Egervary Research Group on Combinatorial Optimization, EGRES). * @@ -133,7 +133,7 @@ /// these cases. UNBOUNDED }; - + private: TEMPLATE_DIGRAPH_TYPEDEFS(GR); @@ -184,7 +184,7 @@ IntVector _pred; public: - + /// \brief Constant for infinite upper bounds (capacities). /// /// Constant for infinite upper bounds (capacities). @@ -211,10 +211,10 @@ const ValueVector &_excess; CostVector &_pi; IntVector &_pred; - + IntVector _proc_nodes; CostVector _dist; - + public: ResidualDijkstra(CapacityScaling& cs) : @@ -439,7 +439,7 @@ _supply[_node_id[t]] = -k; return *this; } - + /// @} /// \name Execution control @@ -575,7 +575,7 @@ _upper.resize(_res_arc_num); _cost.resize(_res_arc_num); _supply.resize(_node_num); - + _res_cap.resize(_res_arc_num); _pi.resize(_node_num); _excess.resize(_node_num); @@ -619,7 +619,7 @@ _reverse[fi] = bi; _reverse[bi] = fi; } - + // Reset parameters resetParams(); return *this; @@ -728,7 +728,7 @@ _sum_supply += _supply[i]; } if (_sum_supply > 0) return INFEASIBLE; - + // Initialize vectors for (int i = 0; i != _root; ++i) { _pi[i] = 0; @@ -776,7 +776,7 @@ } } } - + // Handle GEQ supply type if (_sum_supply < 0) { _pi[_root] = 0; @@ -844,9 +844,9 @@ if (_sum_supply < 0 || pr > 0) { for (int i = 0; i != _node_num; ++i) { _pi[i] -= pr; - } + } } - + return pt; }