[Lemon-commits] [lemon_svn] deba: r2656 - hugo/trunk/lemon

[Lemon SVN]

Author: deba
Date: Mon Mar 27 18:25:14 2006
New Revision: 2656

Modified:
   hugo/trunk/lemon/dfs.h
   hugo/trunk/lemon/preflow.h

Log:
Adding todo to preflow
Some naming convention renamings




Modified: hugo/trunk/lemon/dfs.h
==============================================================================
--- hugo/trunk/lemon/dfs.h	(original)
+++ hugo/trunk/lemon/dfs.h	Mon Mar 27 18:25:14 2006
@@ -921,7 +921,7 @@
     ///The type of the map that stores the distances of the nodes.
     typedef typename TR::DistMap DistMap;
 
-public:
+  public:
     /// Constructor.
     DfsWizard() : TR() {}
 

Modified: hugo/trunk/lemon/preflow.h
==============================================================================
--- hugo/trunk/lemon/preflow.h	(original)
+++ hugo/trunk/lemon/preflow.h	Mon Mar 27 18:25:14 2006
@@ -62,10 +62,11 @@
   ///
   ///\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:
     typedef typename Graph::Node Node;
@@ -83,7 +84,7 @@
     const CapacityMap* _capacity;
     FlowMap* _flow;
 
-    TOL surely;
+    Tolerance _surely;
     
     int _node_num;      //the number of nodes of G
     
@@ -160,9 +161,9 @@
     ///flowMap, resp.
       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) { 
 	if ( _source==_target )
@@ -173,7 +174,7 @@
 
     ///Give a reference to the tolerance handler class
     ///\sa Tolerance
-    TOL &tolerance() { return surely; }
+    Tolerance &tolerance() { return _surely; }
 
     ///Runs the preflow algorithm.