Changeset 2019:e70c1f6849bc in lemon-0.x

Timestamp:

03/27/06 18:25:14 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2656

Message:

Adding todo to preflow
Some naming convention renamings

Location:

lemon

Files:

• dfs.h (modified) (1 diff)
• preflow.h (modified) (4 diffs)

lemon/dfs.h

@@ -922 +922 @@
     typedef typename TR::DistMap DistMap;
 
-public:
+  public:
     /// Constructor.
     DfsWizard() : TR() {}

lemon/preflow.h

@@ -63 +63 @@
   ///\author Jacint Szabo 
   ///\todo Second template parameter is superfluous
+  ///\todo Using tolerance
   template <typename Graph, typename Num,
             typename CapacityMap=typename Graph::template EdgeMap<Num>,
             typename FlowMap=typename Graph::template EdgeMap<Num>,
-            typename TOL=Tolerance<Num> >
+            typename Tolerance=Tolerance<Num> >
   class Preflow {
   protected:
@@ -84 +85 @@
     FlowMap* _flow;
 
-    TOL surely;
+    Tolerance _surely;
     
     int _node_num;      //the number of nodes of G
@@ -161 +162 @@
       Preflow(const Graph& _gr, Node _s, Node _t, 
               const CapacityMap& _cap, FlowMap& _f,
-              const TOL &tol=TOL()) :
+              const Tolerance &_sr=Tolerance()) :
         _g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
-        _flow(&_f), surely(tol),
+        _flow(&_f), _surely(_sr),
         _node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 
         flow_prop(NO_FLOW), status(AFTER_NOTHING) { 
@@ -174 +175 @@
     ///Give a reference to the tolerance handler class
     ///\sa Tolerance
-    TOL &tolerance() { return surely; }
+    Tolerance &tolerance() { return _surely; }
 
     ///Runs the preflow algorithm.