Changeset 2533:aea952a1af99 in lemon-0.x for lemon/cycle_canceling.h

Timestamp:

12/05/07 02:43:02 (17 years ago)

Author:

Peter Kovacs

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fixes.

File:

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

lemon/cycle_canceling.h

@@ -87 +87 @@
   /// \author Peter Kovacs
 
-template < typename Graph,
-           typename LowerMap = typename Graph::template EdgeMap<int>,
-           typename CapacityMap = LowerMap,
-           typename CostMap = typename Graph::template EdgeMap<int>,
-           typename SupplyMap = typename Graph::template NodeMap
-                                <typename CapacityMap::Value> >
+  template < typename Graph,
+             typename LowerMap = typename Graph::template EdgeMap<int>,
+             typename CapacityMap = LowerMap,
+             typename CostMap = typename Graph::template EdgeMap<int>,
+             typename SupplyMap = typename Graph::template NodeMap
+                                  <typename CapacityMap::Value> >
   class CycleCanceling
   {
@@ -324 +324 @@
 
       // Finding a feasible flow
-      Circulation< Graph, Capacity, ConstMap<Edge, Capacity>,
-        CapacityRefMap, SupplyMap >::DefFlowMap<FlowMap>::Create
-        circulation( graph, constMap<Edge>((Capacity)0),
-                     capacity, supply);
-      circulation.flowMap(flowMap);
-      return circulation.run();
+      Circulation< Graph, ConstMap<Edge, Capacity>, CapacityRefMap,
+                   SupplyMap >
+        circulation( graph, constMap<Edge>((Capacity)0), capacity, 
+                     supply );
+      circulation.flowMap(flow);
+      return circulation.run() == -1;
     }