Changes in lemon/nearest_neighbor_tsp.h [1205:d3dcc49e6403:1294:15e233f588da] in lemon

File:

• lemon/nearest_neighbor_tsp.h (modified) (4 diffs)

lemon/nearest_neighbor_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).
@@ -116 +116 @@
             for (IncEdgeIt e(_gr, n1); e != INVALID; ++e) {
               if (!used[_gr.runningNode(e)] &&
-                  (_cost[e] < _cost[min_edge1] || min_edge1 == INVALID)) {
+                  (min_edge1 == INVALID || _cost[e] < _cost[min_edge1])) {
                 min_edge1 = e;
               }
@@ -125 +125 @@
             for (IncEdgeIt e(_gr, n2); e != INVALID; ++e) {
               if (!used[_gr.runningNode(e)] &&
-                  (_cost[e] < _cost[min_edge2] || min_edge2 == INVALID)) {
+                  (min_edge2 == INVALID||_cost[e] < _cost[min_edge2])) {
                 min_edge2 = e;
               }
@@ -216 +216 @@
       ///
       /// This function copies the found tour as a list of arcs/edges into
-      /// the given \ref concept::Path "path structure".
+      /// the given \ref lemon::concepts::Path "path structure".
       ///
       /// \pre run() must be called before using this function.