Changeset 2507:6520edb2c3f3 in lemon-0.x

Timestamp:

11/07/07 22:52:57 (17 years ago)

Author:

Peter Kovacs

Branch:

default

Phase:

public

Convert:

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

Message:

Small bug fix.

Location:

lemon

Files:

• capacity_scaling.h (modified) (3 diffs)
• min_cost_max_flow.h (modified) (2 diffs)

lemon/capacity_scaling.h

@@ -365 +365 @@
         for (OutEdgeIt e(graph, n); e != INVALID; ++e)
           s -= _lower[e];
-        supply[n] = imbalance[n] = s;
+        supply[n] = s;
         sum += s;
       }
@@ -446 +446 @@
         for (OutEdgeIt e(graph, n); e != INVALID; ++e)
           s -= _lower[e];
-        supply[n] = imbalance[n] = s;
+        supply[n] = s;
       }
       valid_supply = true;
@@ -534 +534 @@
     bool init() {
       if (!valid_supply) return false;
+      imbalance = supply;
 
       // Initalizing Dijkstra class

lemon/min_cost_max_flow.h

@@ -76 +76 @@
     /// \brief The type of the flow map.
     typedef typename Graph::template EdgeMap<Capacity> FlowMap;
+    typedef typename CostMap::Value Cost;
 
   private:
@@ -134 +135 @@
     Cost totalCost() const {
       Cost c = 0;
-      for (EdgeIt e(graph); e != INVALID; ++e)
+      for (typename Graph::EdgeIt e(graph); e != INVALID; ++e)
         c += flow[e] * cost[e];
       return c;