Changeset 862:b6f76c95992e in lemon-1.2 for lemon

Timestamp:

03/04/10 10:03:14 (15 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Clarify type names in NetworkSimplex? (#353)

This patch clarifies the misleading effects of the renamings
in [f3bc4e9b5f3a].

File:

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

lemon/network_simplex.h

@@ -171 +171 @@
 
     // State constants for arcs
-    enum ArcStateEnum {
+    enum ArcState {
       STATE_UPPER = -1,
       STATE_TREE  =  0,
       STATE_LOWER =  1
     };
+
+    typedef std::vector<signed char> StateVector;
+    // Note: vector<signed char> is used instead of vector<ArcState> for
+    // efficiency reasons
 
   private:
@@ -216 +220 @@
     IntVector _dirty_revs;
     BoolVector _forward;
-    BoolVector _state;
+    StateVector _state;
     int _root;
 
@@ -247 +251 @@
       const IntVector  &_target;
       const CostVector &_cost;
-      const BoolVector &_state;
+      const StateVector &_state;
       const CostVector &_pi;
       int &_in_arc;
@@ -299 +303 @@
       const IntVector  &_target;
       const CostVector &_cost;
-      const BoolVector &_state;
+      const StateVector &_state;
       const CostVector &_pi;
       int &_in_arc;
@@ -338 +342 @@
       const IntVector  &_target;
       const CostVector &_cost;
-      const BoolVector &_state;
+      const StateVector &_state;
       const CostVector &_pi;
       int &_in_arc;
@@ -411 +415 @@
       const IntVector  &_target;
       const CostVector &_cost;
-      const BoolVector &_state;
+      const StateVector &_state;
       const CostVector &_pi;
       int &_in_arc;
@@ -514 +518 @@
       const IntVector  &_target;
       const CostVector &_cost;
-      const BoolVector &_state;
+      const StateVector &_state;
       const CostVector &_pi;
       int &_in_arc;