Ticket #47: suurb1_39ff10276621.patch

lemon/suurballe.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -53 +53 @@
   /// with \ref SplitDigraphAdaptor.
   ///
   /// \author Attila Bernath and Peter Kovacs
-  
-  template < typename Digraph, 
+
+  template < typename Digraph,
              typename LengthMap = typename Digraph::template ArcMap<int> >
   class Suurballe
   {
@@ -74 +74 @@
     typedef SimplePath<Digraph> Path;
 
   private:
-  
+
     /// \brief Special implementation of the \ref Dijkstra algorithm
     /// for finding shortest paths in the residual network.
     ///
@@ -104 +104 @@
       PredMap &_pred;
       // The processed (i.e. permanently labeled) nodes
       std::vector<Node> _proc_nodes;
-      
+
       Node _s;
       Node _t;
 
@@ -198 +198 @@
     const Digraph &_graph;
     // The length map
     const LengthMap &_length;
-    
+
     // Arc map of the current flow
     FlowMap *_flow;
     bool _local_flow;
@@ -266 +266 @@
     ///
     /// Sets the potential map.
     ///
-    /// The potentials provide the dual solution of the underlying 
+    /// The potentials provide the dual solution of the underlying
     /// minimum cost flow problem.
     ///
     /// \return \c (*this)
@@ -328 +328 @@
       for (ArcIt e(_graph); e != INVALID; ++e) (*_flow)[e] = 0;
       for (NodeIt n(_graph); n != INVALID; ++n) (*_potential)[n] = 0;
 
-      _dijkstra = new ResidualDijkstra( _graph, *_flow, _length, 
+      _dijkstra = new ResidualDijkstra( _graph, *_flow, _length,
                                         *_potential, _pred,
                                         _source, _target );
     }
@@ -368 +368 @@
       }
       return _path_num;
     }
-    
+
     /// \brief Computes the paths from the flow.
     ///
     /// Computes the paths from the flow.
@@ -420 +420 @@
     /// found potentials (the dual solution).
     ///
     /// Returns a const reference to the node map storing the found
-    /// potentials that provide the dual solution of the underlying 
+    /// potentials that provide the dual solution of the underlying
     /// minimum cost flow problem.
     ///
     /// \pre \ref run() or findFlow() must be called before using this

test/suurballe_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -30 +30 @@
 
 // Checks the feasibility of the flow
 template <typename Digraph, typename FlowMap>
-bool checkFlow( const Digraph& gr, const FlowMap& flow, 
+bool checkFlow( const Digraph& gr, const FlowMap& flow,
                 typename Digraph::Node s, typename Digraph::Node t,
                 int value )
 {
@@ -53 +53 @@
 }
 
 // Checks the optimalitiy of the flow
-template < typename Digraph, typename CostMap, 
+template < typename Digraph, typename CostMap,
            typename FlowMap, typename PotentialMap >
 bool checkOptimality( const Digraph& gr, const CostMap& cost,
                       const FlowMap& flow, const PotentialMap& pi )
@@ -110 +110 @@
     node("target", target).
     run();
   input.close();
-  
+
   // Finding 2 paths
   {
     Suurballe<ListDigraph> suurballe(digraph, length, source, target);
@@ -118 +118 @@
     check(checkFlow(digraph, suurballe.flowMap(), source, target, 2),
           "The flow is not feasible");
     check(suurballe.totalLength() == 510, "The flow is not optimal");
-    check(checkOptimality(digraph, length, suurballe.flowMap(), 
+    check(checkOptimality(digraph, length, suurballe.flowMap(),
                           suurballe.potentialMap()),
           "Wrong potentials");
     for (int i = 0; i < suurballe.pathNum(); ++i)
@@ -133 +133 @@
     check(checkFlow(digraph, suurballe.flowMap(), source, target, 3),
           "The flow is not feasible");
     check(suurballe.totalLength() == 1040, "The flow is not optimal");
-    check(checkOptimality(digraph, length, suurballe.flowMap(), 
+    check(checkOptimality(digraph, length, suurballe.flowMap(),
                           suurballe.potentialMap()),
           "Wrong potentials");
     for (int i = 0; i < suurballe.pathNum(); ++i)
@@ -148 +148 @@
     check(checkFlow(digraph, suurballe.flowMap(), source, target, 3),
           "The flow is not feasible");
     check(suurballe.totalLength() == 1040, "The flow is not optimal");
-    check(checkOptimality(digraph, length, suurballe.flowMap(), 
+    check(checkOptimality(digraph, length, suurballe.flowMap(),
                           suurballe.potentialMap()),
           "Wrong potentials");
     for (int i = 0; i < suurballe.pathNum(); ++i)