Changeset 2541:e67ec65747fa in lemon-0.x for lemon/circulation.h

Timestamp:

12/12/07 14:35:55 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fix

File:

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

lemon/circulation.h

@@ -404 +404 @@
       }
 
-      typename Graph::template NodeMap<bool> reached(_g, false);
-
-
       // global relabeling tested, but in general case it provides
       // worse performance for random graphs
@@ -437 +434 @@
         } else if (_tol.positive((*_excess)[_g.target(e)] + (*_lo)[e])) {
           _flow->set(e, (*_lo)[e]);
-          _excess->set(_g.target(e), (*_excess)[_g.target(e)] + (*_up)[e]);
-          _excess->set(_g.source(e), (*_excess)[_g.source(e)] - (*_up)[e]);
+          _excess->set(_g.target(e), (*_excess)[_g.target(e)] + (*_lo)[e]);
+          _excess->set(_g.source(e), (*_excess)[_g.source(e)] - (*_lo)[e]);
         } else {
           Value fc = -(*_excess)[_g.target(e)];
@@ -472 +469 @@
         int mlevel=_node_num;
         Value exc=(*_excess)[act];
-        
+
         for(OutEdgeIt e(_g,act);e!=INVALID; ++e) {
           Node v = _g.target(e);
@@ -489 +486 @@
             else {
               _flow->set(e, (*_up)[e]);
-              _excess->set(v, (*_excess)[v] + exc);
+              _excess->set(v, (*_excess)[v] + fc);
               if(!_level->active(v) && _tol.positive((*_excess)[v]))
                 _level->activate(v);