Merge bugfix #476 to branch 1.3 1.3
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 22 Jan 2014 15:34:29 +0100
branch1.3
changeset 1116c180a66f6edd
parent 1114 7a833615b224
parent 1115 1ba759c76810
child 1119 bdc029900564
Merge bugfix #476 to branch 1.3
     1.1 --- a/test/tsp_test.cc	Thu Oct 24 13:04:49 2013 +0200
     1.2 +++ b/test/tsp_test.cc	Wed Jan 22 15:34:29 2014 +0100
     1.3 @@ -132,7 +132,8 @@
     1.4      unsigned nsize = n;
     1.5      int esize = n <= 1 ? 0 : n;
     1.6  
     1.7 -    TSP alg(g, constMap<Edge, int>(1));
     1.8 +    ConstMap<Edge, int> cost_map(1);
     1.9 +    TSP alg(g, cost_map);
    1.10  
    1.11      check(alg.run() == esize, alg_name + ": Wrong total cost");
    1.12      check(alg.tourCost() == esize, alg_name + ": Wrong total cost");