Ticket #266: circ-ea2c9187404a.patch

lemon/circulation.h

@@ -151 +151 @@
      the direction of the arcs and taking the negative of the supply values
      (e.g. using \ref ReverseDigraph and \ref NegMap adaptors).
 
+     This algorithm either calculates a feasible circulation, or provides
+     a \ref barrier() "barrier", which prooves that a feasible soultion
+     cannot exist.
+
      Note that this algorithm also provides a feasible solution for the
      \ref min_cost_flow "minimum cost flow problem".
 
@@ -380 +384 @@
 
     /// Sets the upper bound (capacity) map.
     /// \return <tt>(*this)</tt>
-    Circulation& upperMap(const LowerMap& map) {
+    Circulation& upperMap(const UpperMap& map) {
       _up = &map;
       return *this;
     }
 
+    /// Sets the upper bound (capacity) map.
+
+    /// Sets the upper bound (capacity) map.
+    /// \return <tt>(*this)</tt>
+    Circulation& capacityMap(const UpperMap& map) {
+      _up = &map;
+      return *this;
+    }
+
+    /// Sets the lower and upper bound maps.
+
+    /// Sets the lower and upper bound maps.
+    /// \return <tt>(*this)</tt>
+    Circulation& boundMaps(const LowerMap& lower, const UpperMap& upper) {
+      _lo = &lower;
+      _up = &upper;
+      return *this;
+    }
+
     /// Sets the supply map.
 
     /// Sets the supply map.

test/circulation_test.cc

@@ -85 +85 @@
   circ_test
     .lowerMap(lcap)
     .upperMap(ucap)
+    .capacityMap(ucap)
+    .boundMaps(lcap, ucap)
     .supplyMap(supply)
     .flowMap(flow);