Changeset 877:141f9c0db4a3 in lemon-main for lemon/suurballe.h

Timestamp:

03/06/10 15:35:12 (14 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

879:38213abd2911, 931:f112c18bc304

Phase:

public

Message:

Unify the sources (#339)

File:

• lemon/suurballe.h (modified) (11 diffs)

lemon/suurballe.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -66 +66 @@
     /// and it must have an \c addBack() function.
     typedef lemon::Path<Digraph> Path;
-    
+
     /// The cross reference type used for the heap.
     typedef typename GR::template NodeMap<int> HeapCrossRef;
@@ -159 +159 @@
       Node _s;
       Node _t;
-      
+
       PotentialMap _dist;
       std::vector<Node> _proc_nodes;
@@ -168 +168 @@
       ResidualDijkstra(Suurballe &srb) :
         _graph(srb._graph), _length(srb._length),
-        _flow(*srb._flow), _pi(*srb._potential), _pred(srb._pred), 
+        _flow(*srb._flow), _pi(*srb._potential), _pred(srb._pred),
         _s(srb._s), _t(srb._t), _dist(_graph) {}
-        
+
       // Run the algorithm and return true if a path is found
       // from the source node to the target node.
@@ -178 +178 @@
 
     private:
-    
+
       // Execute the algorithm for the first time (the flow and potential
       // functions have to be identically zero).
@@ -349 +349 @@
       typedef Suurballe<GR, LEN, SetPathTraits<T> > Create;
     };
-    
+
     template <typename H, typename CR>
     struct SetHeapTraits : public Traits {
@@ -360 +360 @@
     ///
     /// \ref named-templ-param "Named parameter" for setting \c Heap
-    /// and \c HeapCrossRef types with automatic allocation. 
+    /// and \c HeapCrossRef types with automatic allocation.
     /// They will be used for internal Dijkstra computations.
     /// The heap type must conform to the \ref lemon::concepts::Heap "Heap"
@@ -398 +398 @@
     // The pred arc map
     PredMap _pred;
-    
+
     // Data for full init
     PotentialMap *_init_dist;
@@ -556 +556 @@
       dijk.distMap(*_init_dist).predMap(*_init_pred);
       dijk.run(s);
-      
+
       _full_init = true;
     }
@@ -600 +600 @@
       _t = t;
       ResidualDijkstra dijkstra(*this);
-      
+
       // Initialization
       for (ArcIt e(_graph); e != INVALID; ++e) {
@@ -614 +614 @@
           (*_flow)[e] = 1;
           u = _graph.source(e);
-        }        
+        }
         _path_num = 1;
       } else {