1.1 --- a/lemon/dfs.h Mon Mar 27 16:09:54 2006 +0000
1.2 +++ b/lemon/dfs.h Mon Mar 27 16:25:14 2006 +0000
1.3 @@ -921,7 +921,7 @@
1.4 ///The type of the map that stores the distances of the nodes.
1.5 typedef typename TR::DistMap DistMap;
1.6
1.7 -public:
1.8 + public:
1.9 /// Constructor.
1.10 DfsWizard() : TR() {}
1.11
2.1 --- a/lemon/preflow.h Mon Mar 27 16:09:54 2006 +0000
2.2 +++ b/lemon/preflow.h Mon Mar 27 16:25:14 2006 +0000
2.3 @@ -62,10 +62,11 @@
2.4 ///
2.5 ///\author Jacint Szabo
2.6 ///\todo Second template parameter is superfluous
2.7 + ///\todo Using tolerance
2.8 template <typename Graph, typename Num,
2.9 typename CapacityMap=typename Graph::template EdgeMap<Num>,
2.10 typename FlowMap=typename Graph::template EdgeMap<Num>,
2.11 - typename TOL=Tolerance<Num> >
2.12 + typename Tolerance=Tolerance<Num> >
2.13 class Preflow {
2.14 protected:
2.15 typedef typename Graph::Node Node;
2.16 @@ -83,7 +84,7 @@
2.17 const CapacityMap* _capacity;
2.18 FlowMap* _flow;
2.19
2.20 - TOL surely;
2.21 + Tolerance _surely;
2.22
2.23 int _node_num; //the number of nodes of G
2.24
2.25 @@ -160,9 +161,9 @@
2.26 ///flowMap, resp.
2.27 Preflow(const Graph& _gr, Node _s, Node _t,
2.28 const CapacityMap& _cap, FlowMap& _f,
2.29 - const TOL &tol=TOL()) :
2.30 + const Tolerance &_sr=Tolerance()) :
2.31 _g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
2.32 - _flow(&_f), surely(tol),
2.33 + _flow(&_f), _surely(_sr),
2.34 _node_num(countNodes(_gr)), level(_gr), excess(_gr,0),
2.35 flow_prop(NO_FLOW), status(AFTER_NOTHING) {
2.36 if ( _source==_target )
2.37 @@ -173,7 +174,7 @@
2.38
2.39 ///Give a reference to the tolerance handler class
2.40 ///\sa Tolerance
2.41 - TOL &tolerance() { return surely; }
2.42 + Tolerance &tolerance() { return _surely; }
2.43
2.44 ///Runs the preflow algorithm.
2.45