# HG changeset patch # User Alpar Juttner # Date 1390401269 -3600 # Node ID c180a66f6edda02be370e0ee994f9ac625c37c2d # Parent 7a833615b2241e61dc6fb28c00ee826436096610# Parent 1ba759c76810037cdf3bf087e56606f282fec455 Merge bugfix #476 to branch 1.3 diff -r 7a833615b224 -r c180a66f6edd test/tsp_test.cc --- a/test/tsp_test.cc Thu Oct 24 13:04:49 2013 +0200 +++ b/test/tsp_test.cc Wed Jan 22 15:34:29 2014 +0100 @@ -132,7 +132,8 @@ unsigned nsize = n; int esize = n <= 1 ? 0 : n; - TSP alg(g, constMap(1)); + ConstMap cost_map(1); + TSP alg(g, cost_map); check(alg.run() == esize, alg_name + ": Wrong total cost"); check(alg.tourCost() == esize, alg_name + ": Wrong total cost");