Changeset 2509:a8081c9cd96a in lemon-0.x for lemon/network_simplex.h

Timestamp:

11/14/07 07:28:08 (16 years ago)

Author:

Peter Kovacs

Branch:

default

Phase:

public

Convert:

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

Message:

Small changes in the min. cost flow classes.

File:

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

lemon/network_simplex.h

@@ -27 +27 @@
 
 #include <limits>
+#include <lemon/graph_adaptor.h>
+#include <lemon/graph_utils.h>
 #include <lemon/smart_graph.h>
-#include <lemon/graph_utils.h>
 
 /// \brief The pivot rule used in the algorithm.
@@ -86 +87 @@
   /// - Edge capacities and costs should be nonnegative integers.
   ///   However \c CostMap::Value should be signed type.
-  /// - Supply values should be integers.
+  /// - Supply values should be signed integers.
   /// - \c LowerMap::Value must be convertible to
   ///   \c CapacityMap::Value and \c CapacityMap::Value must be
@@ -149 +150 @@
     public:
 
-      typedef typename MapBase<Edge, Cost>::Value Value;
-      typedef typename MapBase<Edge, Cost>::Key Key;
-
       ReducedCostMap( const SGraph &_gr,
                       const SCostMap &_cm,
@@ -157 +155 @@
         gr(_gr), cost_map(_cm), pot_map(_pm) {}
 
-      Value operator[](const Key &e) const {
+      Cost operator[](const Edge &e) const {
         return cost_map[e] - pot_map[gr.source(e)] + pot_map[gr.target(e)];
       }