Changeset 1081:f1398882a928 in lemon for lemon/network_simplex.h

Timestamp:

08/08/11 12:36:16 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.1

Phase:

public

Tags:

r1.1.4

Message:

Unify sources

File:

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

lemon/network_simplex.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -96 +96 @@
       UNBOUNDED
     };
-    
+
     /// \brief Constants for selecting the type of the supply constraints.
     ///
@@ -114 +114 @@
       LEQ
     };
-    
+
     /// \brief Constants for selecting the pivot rule.
     ///
@@ -157 +157 @@
       ALTERING_LIST
     };
-    
+
   private:
 
@@ -224 +224 @@
 
   public:
-  
+
     /// \brief Constant for infinite upper bounds (capacities).
     ///
@@ -645 +645 @@
       LEMON_ASSERT(std::numeric_limits<Cost>::is_signed,
         "The cost type of NetworkSimplex must be signed");
-        
+
       // Resize vectors
       _node_num = countNodes(_graph);
@@ -685 +685 @@
         if ((i += k) >= _arc_num) i = (i % k) + 1;
       }
-      
+
       // Initialize maps
       for (int i = 0; i != _node_num; ++i) {
@@ -810 +810 @@
       return *this;
     }
-    
+
     /// \brief Set the type of the supply constraints.
     ///
@@ -836 +836 @@
     /// This function runs the algorithm.
     /// The paramters can be specified using functions \ref lowerMap(),
-    /// \ref upperMap(), \ref costMap(), \ref supplyMap(), \ref stSupply(), 
+    /// \ref upperMap(), \ref costMap(), \ref supplyMap(), \ref stSupply(),
     /// \ref supplyType().
     /// For example,
@@ -1055 +1055 @@
         _state[i] = STATE_LOWER;
       }
-      
+
       // Set data for the artificial root node
       _root = _node_num;
@@ -1229 +1229 @@
       for (int u = second; u != join; u = _parent[u]) {
         e = _pred[u];
-        d = _forward[u] ? 
+        d = _forward[u] ?
           (_cap[e] == INF ? INF : _cap[e] - _flow[e]) : _flow[e];
         if (d <= delta) {
@@ -1436 +1436 @@
         }
       }
-      
+
       // Check feasibility
       for (int e = _search_arc_num; e != _all_arc_num; ++e) {
@@ -1453 +1453 @@
         }
       }
-      
+
       // Shift potentials to meet the requirements of the GEQ/LEQ type
       // optimality conditions