Changeset 1092:dceba191c00d in lemon-main for test/tsp_test.cc

Timestamp:

08/09/13 11:28:17 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

1093:fb1c7da561ce, 1165:e0ccc1f0268f

Phase:

public

Message:

Apply unify-sources.sh to the source tree

File:

• test/tsp_test.cc (modified) (12 diffs)

test/tsp_test.cc

@@ -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).
@@ -42 +42 @@
 //   check(checkMetricCost(g, constMap<Edge>(1)), "Wrong checkMetricCost()");
 //   check(!checkMetricCost(g, constMap<Edge>(-1)), "Wrong checkMetricCost()");
-//   
+//
 //   FullGraph::EdgeMap<float> cost(g);
 //   for (NodeIt u(g); u != INVALID; ++u) {
@@ -65 +65 @@
 bool checkTour(const FullGraph &gr, const Container &p) {
   FullGraph::NodeMap<bool> used(gr, false);
-  
+
   int node_cnt = 0;
   for (typename Container::const_iterator it = p.begin(); it != p.end(); ++it) {
@@ -73 +73 @@
     ++node_cnt;
   }
-  
+
   return (node_cnt == gr.nodeNum());
 }
@@ -80 +80 @@
 bool checkTourPath(const FullGraph &gr, const Path<FullGraph> &p) {
   FullGraph::NodeMap<bool> used(gr, false);
-  
+
   if (!checkPath(gr, p)) return false;
   if (gr.nodeNum() <= 1 && p.length() != 0) return false;
@@ -182 +182 @@
       }
     }
-    
+
     check(alg.run() > 0, alg_name + ": Wrong total cost");
 
@@ -196 +196 @@
     check(checkCost(g, path, cost, alg.tourCost()),
       alg_name + ": Wrong tour cost");
-    
+
     check(!Tolerance<double>().less(alg.tourCost(), opt2.run(alg.tourNodes())),
       "2-opt improvement: Wrong total cost");
@@ -203 +203 @@
     check(checkCost(g, opt2.tourNodes(), cost, opt2.tourCost()),
       "2-opt improvement: Wrong tour cost");
-    
+
     check(!Tolerance<double>().less(alg.tourCost(), opt2.run(path)),
       "2-opt improvement: Wrong total cost");
@@ -213 +213 @@
 }
 
-// Algorithm class for Nearest Insertion 
+// Algorithm class for Nearest Insertion
 template <typename CM>
 class NearestInsertionTsp : public InsertionTsp<CM> {
@@ -224 +224 @@
 };
 
-// Algorithm class for Farthest Insertion 
+// Algorithm class for Farthest Insertion
 template <typename CM>
 class FarthestInsertionTsp : public InsertionTsp<CM> {
@@ -235 +235 @@
 };
 
-// Algorithm class for Cheapest Insertion 
+// Algorithm class for Cheapest Insertion
 template <typename CM>
 class CheapestInsertionTsp : public InsertionTsp<CM> {
@@ -246 +246 @@
 };
 
-// Algorithm class for Random Insertion 
+// Algorithm class for Random Insertion
 template <typename CM>
 class RandomInsertionTsp : public InsertionTsp<CM> {