Changeset 1270:dceba191c00d in lemon for lemon/insertion_tsp.h

Timestamp:

08/09/13 11:28:17 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

1271:fb1c7da561ce, 1381:e0ccc1f0268f

Phase:

public

Message:

Apply unify-sources.sh to the source tree

File:

• lemon/insertion_tsp.h (modified) (6 diffs)

lemon/insertion_tsp.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2013
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -361 +361 @@
               Node u = _notused[i];
               Cost min_cost = costDiff(_tour.back(), _tour.front(), u);
-              int min_pos = 0;              
+              int min_pos = 0;
               for (unsigned int j=1; j<_tour.size(); ++j) {
                 Cost curr_cost = costDiff(_tour[j-1], _tour[j], u);
@@ -391 +391 @@
             _notused[min_node] = _notused.back();
             _notused.pop_back();
-            
+
             // Insert the selected node into the tour
             const int ipos = _ins_pos[sn];
@@ -406 +406 @@
               Cost nc1 = costDiff(_tour[ipos_prev], _tour[ipos], u);
               Cost nc2 = costDiff(_tour[ipos], _tour[ipos_next], u);
-              
+
               if (nc1 <= curr_cost || nc2 <= curr_cost) {
                 // A new position is better than the old one
@@ -421 +421 @@
                   // The minimum should be found again
                   curr_cost = costDiff(_tour.back(), _tour.front(), u);
-                  curr_pos = 0;              
+                  curr_pos = 0;
                   for (unsigned int j=1; j<_tour.size(); ++j) {
                     Cost tmp_cost = costDiff(_tour[j-1], _tour[j], u);
@@ -434 +434 @@
                 }
               }
-              
+
               _ins_cost[u] = curr_cost;
               _ins_pos[u] = curr_pos;