test/tsp_test.cc
changeset 1093 fb1c7da561ce
parent 1092 dceba191c00d
child 1106 1ba759c76810
     1.1 --- a/test/tsp_test.cc	Fri Aug 09 11:28:17 2013 +0200
     1.2 +++ b/test/tsp_test.cc	Fri Aug 09 11:29:40 2013 +0200
     1.3 @@ -66,12 +66,13 @@
     1.4    FullGraph::NodeMap<bool> used(gr, false);
     1.5  
     1.6    int node_cnt = 0;
     1.7 -  for (typename Container::const_iterator it = p.begin(); it != p.end(); ++it) {
     1.8 -    FullGraph::Node node = *it;
     1.9 -    if (used[node]) return false;
    1.10 -    used[node] = true;
    1.11 -    ++node_cnt;
    1.12 -  }
    1.13 +  for (typename Container::const_iterator it = p.begin(); it != p.end(); ++it)
    1.14 +    {
    1.15 +      FullGraph::Node node = *it;
    1.16 +      if (used[node]) return false;
    1.17 +      used[node] = true;
    1.18 +      ++node_cnt;
    1.19 +    }
    1.20  
    1.21    return (node_cnt == gr.nodeNum());
    1.22  }
    1.23 @@ -264,8 +265,10 @@
    1.24    tspTestSmall<NearestNeighborTsp<ConstMap<Edge, int> > >("Nearest Neighbor");
    1.25    tspTestSmall<GreedyTsp<ConstMap<Edge, int> > >("Greedy");
    1.26    tspTestSmall<NearestInsertionTsp<ConstMap<Edge, int> > >("Nearest Insertion");
    1.27 -  tspTestSmall<FarthestInsertionTsp<ConstMap<Edge, int> > >("Farthest Insertion");
    1.28 -  tspTestSmall<CheapestInsertionTsp<ConstMap<Edge, int> > >("Cheapest Insertion");
    1.29 +  tspTestSmall<FarthestInsertionTsp<ConstMap<Edge, int> > >
    1.30 +    ("Farthest Insertion");
    1.31 +  tspTestSmall<CheapestInsertionTsp<ConstMap<Edge, int> > >
    1.32 +    ("Cheapest Insertion");
    1.33    tspTestSmall<RandomInsertionTsp<ConstMap<Edge, int> > >("Random Insertion");
    1.34    tspTestSmall<ChristofidesTsp<ConstMap<Edge, int> > >("Christofides");
    1.35    tspTestSmall<Opt2Tsp<ConstMap<Edge, int> > >("2-opt");