1.1 --- a/lemon/hartmann_orlin_mmc.h Wed Mar 17 12:35:52 2010 +0100
1.2 +++ b/lemon/hartmann_orlin_mmc.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 @@ -343,14 +343,14 @@
1.16 // Initialization and find strongly connected components
1.17 init();
1.18 findComponents();
1.19 -
1.20 +
1.21 // Find the minimum cycle mean in the components
1.22 for (int comp = 0; comp < _comp_num; ++comp) {
1.23 if (!initComponent(comp)) continue;
1.24 processRounds();
1.25 -
1.26 +
1.27 // Update the best cycle (global minimum mean cycle)
1.28 - if ( _curr_found && (!_best_found ||
1.29 + if ( _curr_found && (!_best_found ||
1.30 _curr_cost * _best_size < _best_cost * _curr_size) ) {
1.31 _best_found = true;
1.32 _best_cost = _curr_cost;
1.33 @@ -503,7 +503,7 @@
1.34 int n = _nodes->size();
1.35 if (n < 1 || (n == 1 && _out_arcs[(*_nodes)[0]].size() == 0)) {
1.36 return false;
1.37 - }
1.38 + }
1.39 for (int i = 0; i < n; ++i) {
1.40 _data[(*_nodes)[i]].resize(n + 1, PathData(INF));
1.41 }
1.42 @@ -576,7 +576,7 @@
1.43 }
1.44 }
1.45 }
1.46 -
1.47 +
1.48 // Check early termination
1.49 bool checkTermination(int k) {
1.50 typedef std::pair<int, int> Pair;
1.51 @@ -586,7 +586,7 @@
1.52 LargeCost cost;
1.53 int size;
1.54 Node u;
1.55 -
1.56 +
1.57 // Search for cycles that are already found
1.58 _curr_found = false;
1.59 for (int i = 0; i < n; ++i) {
1.60 @@ -607,8 +607,8 @@
1.61 }
1.62 level[u] = Pair(i, j);
1.63 if (j != 0) {
1.64 - u = _gr.source(_data[u][j].pred);
1.65 - }
1.66 + u = _gr.source(_data[u][j].pred);
1.67 + }
1.68 }
1.69 }
1.70