# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1380101561 -7200
# Node ID f70d8f5a1a5d38899ea3fcc3f038442ba9bd06c9
# Parent  bc0fc7384c508d98417c1c4e57d465b7923951a0# Parent  15e233f588da4563e273f3dc2d489c8e3410e21a
Merge bugfix #476

diff -r bc0fc7384c50 -r f70d8f5a1a5d lemon/nearest_neighbor_tsp.h
--- a/lemon/nearest_neighbor_tsp.h	Sun Aug 11 22:32:16 2013 +0200
+++ b/lemon/nearest_neighbor_tsp.h	Wed Sep 25 11:32:41 2013 +0200
@@ -115,7 +115,7 @@
           if (min_edge1 == INVALID) {
             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;
               }
             }
@@ -124,7 +124,7 @@
           if (min_edge2 == INVALID) {
             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;
               }
             }