Changeset 2579:691ce54544c5 in lemon-0.x

Timestamp:

02/25/08 13:35:06 (17 years ago)

Author:

Peter Kovacs

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fixes in min cost flow files.
Use enum type instead of static constants in NetworkSimplex? to avoid
linker errors.

Location:

lemon

Files:

• min_cost_flow.h (modified) (2 diffs)
• min_cost_max_flow.h (modified) (3 diffs)
• network_simplex.h (modified) (2 diffs)

lemon/min_cost_flow.h

@@ -97 +97 @@
     MinCostFlow( const Graph &graph,
                  const CapacityMap &capacity,
-                 const CostMap &_ost,
+                 const CostMap &cost,
                  const SupplyMap &supply ) :
       MinCostFlowImpl(graph, capacity, cost, supply) {}
@@ -105 +105 @@
                  const LowerMap &lower,
                  const CapacityMap &capacity,
-                 const CostMap &_ost,
+                 const CostMap &cost,
                  Node s, Node t,
                  Supply flow_value ) :

lemon/min_cost_max_flow.h

@@ -141 +141 @@
     /// \pre \ref run() must be called before using this function.
     const FlowMap& flowMap() const {
-      return _flow_result;
+      return _flow;
     }
 
@@ -152 +152 @@
     /// \pre \ref run() must be called before using this function.
     const PotentialMap& potentialMap() const {
-      return _potential_result;
+      return _potential;
     }
 
@@ -163 +163 @@
     Cost totalCost() const {
       Cost c = 0;
-      for (typename Graph::EdgeIt e(graph); e != INVALID; ++e)
+      for (typename Graph::EdgeIt e(_graph); e != INVALID; ++e)
         c += _flow[e] * _cost[e];
       return c;

lemon/network_simplex.h

@@ -135 +135 @@
                       const SCostMap &cost_map,
                       const SPotentialMap &pot_map ) :
-        _gr(gr), _cost_map(cost_map), _pot_map(pm) {}
+        _gr(gr), _cost_map(cost_map), _pot_map(pot_map) {}
 
       ///\e
@@ -420 +420 @@
   private:
 
-    // State constant for edges at their lower bounds.
-    static const int STATE_LOWER =  1;
-    // State constant for edges in the spanning tree.
-    static const int STATE_TREE  =  0;
-    // State constant for edges at their upper bounds.
-    static const int STATE_UPPER = -1;
+    // State constants for edges
+    enum EdgeStateEnum {
+      STATE_UPPER = -1,
+      STATE_TREE  =  0,
+      STATE_LOWER =  1
+    };
 
     // Constant for the combined pivot rule.