Changeset 650:588ff2ca55bd in lemon-0.x for src/work/jacint

Timestamp:

05/20/04 17:40:59 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

a

File:

• src/work/jacint/max_flow.h (modified) (3 diffs)

src/work/jacint/max_flow.h

@@ -64 +64 @@
     FlowMap* flow;
     int n;      //the number of nodes of G
-    typedef ResGraphWrapper<const Graph, Num, CapMap, FlowMap> ResGW;
+    //    typedef ResGraphWrapper<const Graph, Num, CapMap, FlowMap> ResGW;   
+    typedef ExpResGraphWrapper<const Graph, Num, CapMap, FlowMap> ResGW;
     typedef typename ResGW::OutEdgeIt ResGWOutEdgeIt;
     typedef typename ResGW::Edge ResGWEdge;
@@ -140 +141 @@
         map(&_map), number_of_augmentations(&_number_of_augmentations) { }
       void set(const Node& n, bool b) {
-        map->set(n, *number_of_augmentations);
+        if (b)
+          map->set(n, *number_of_augmentations);
+        else 
+          map->set(n, *number_of_augmentations-1);
       }
       bool operator[](const Node& n) const { 
@@ -942 +946 @@
 
     if (status!=AFTER_AUGMENTING) {
-      FOR_EACH_LOC(typename Graph::NodeIt, e, *g) level.set(e, -1); 
-      number_of_augmentations=0;
+      FOR_EACH_LOC(typename Graph::NodeIt, e, *g) level.set(e, 3*n); 
+      number_of_augmentations=3*n+1;
     } else {
       ++number_of_augmentations;