Changeset 1092:dceba191c00d in lemon-main for lemon/christofides_tsp.h

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:

• lemon/christofides_tsp.h (modified) (10 diffs)

lemon/christofides_tsp.h

@@ -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).
@@ -31 +31 @@
 
 namespace lemon {
-  
+
   /// \ingroup tsp
   ///
@@ -109 +109 @@
           return _sum = 2 * _cost[_gr.edge(_gr(0), _gr(1))];
         }
-        
+
         // Compute min. cost spanning tree
         std::vector<Edge> tree;
         kruskal(_gr, _cost, std::back_inserter(tree));
-        
+
         FullGraph::NodeMap<int> deg(_gr, 0);
         for (int i = 0; i != int(tree.size()); ++i) {
@@ -126 +126 @@
           if (deg[u] % 2 == 1) odd_nodes.push_back(u);
         }
-  
+
         SmartGraph sgr;
         SmartGraph::EdgeMap<Cost> scost(sgr);
@@ -140 +140 @@
           }
         }
-        
+
         // Compute min. cost perfect matching
         MaxWeightedPerfectMatching<SmartGraph, SmartGraph::EdgeMap<Cost> >
           mwpm(sgr, scost);
         mwpm.run();
-        
+
         for (SmartGraph::EdgeIt e(sgr); e != INVALID; ++e) {
           if (mwpm.matching(e)) {
@@ -152 +152 @@
           }
         }
-        
-        // Join the spanning tree and the matching        
+
+        // Join the spanning tree and the matching
         sgr.clear();
         for (int i = 0; i != _gr.nodeNum(); ++i) {
@@ -183 +183 @@
 
       /// @}
-      
+
       /// \name Query Functions
       /// @{
-      
+
       /// \brief The total cost of the found tour.
       ///
@@ -195 +195 @@
         return _sum;
       }
-      
+
       /// \brief Returns a const reference to the node sequence of the
       /// found tour.
@@ -228 +228 @@
         std::copy(_path.begin(), _path.end(), out);
       }
-      
+
       /// \brief Gives back the found tour as a path.
       ///
@@ -245 +245 @@
         }
       }
-      
+
       /// @}
-      
+
   };