Changeset 2579:691ce54544c5 in lemon-0.x for lemon/network_simplex.h

Timestamp:

02/25/08 13:35:06 (16 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.

File:

• lemon/network_simplex.h (modified) (2 diffs)

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.