Changeset 1835:eb6c34c76501 in lemon-0.x for lemon/preflow.h

Timestamp:

11/29/05 09:40:03 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• tolerance.h added
• tolerance handler added to preflow (but not yet used!!).

File:

• lemon/preflow.h (modified) (4 diffs)

lemon/preflow.h

@@ -23 +23 @@
 #include <lemon/error.h>
 #include <lemon/invalid.h>
+#include <lemon/tolerance.h>
 #include <lemon/maps.h>
 #include <lemon/graph_utils.h>
@@ -62 +63 @@
   template <typename Graph, typename Num,
             typename CapacityMap=typename Graph::template EdgeMap<Num>,
-            typename FlowMap=typename Graph::template EdgeMap<Num> >
+            typename FlowMap=typename Graph::template EdgeMap<Num>,
+            typename TOL=Tolerance<Num> >
   class Preflow {
   protected:
@@ -79 +81 @@
     const CapacityMap* _capacity;
     FlowMap* _flow;
+
+    TOL surely;
+    
     int _node_num;      //the number of nodes of G
     
@@ -154 +159 @@
     ///flowMap, resp.
       Preflow(const Graph& _gr, Node _s, Node _t, 
-              const CapacityMap& _cap, FlowMap& _f) :
+              const CapacityMap& _cap, FlowMap& _f,
+              const TOL &tol=TOL()) :
         _g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
-        _flow(&_f), _node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 
+        _flow(&_f), surely(tol),
+        _node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 
         flow_prop(NO_FLOW), status(AFTER_NOTHING) { 
         if ( _source==_target )