1.1 --- a/lemon/cycle_canceling.h	Tue Dec 04 18:51:35 2007 +0000
     1.2 +++ b/lemon/cycle_canceling.h	Wed Dec 05 01:43:02 2007 +0000
     1.3 @@ -86,12 +86,12 @@
     1.4    ///
     1.5    /// \author Peter Kovacs
     1.6  
     1.7 -template < typename Graph,
     1.8 -	   typename LowerMap = typename Graph::template EdgeMap<int>,
     1.9 -	   typename CapacityMap = LowerMap,
    1.10 -	   typename CostMap = typename Graph::template EdgeMap<int>,
    1.11 -	   typename SupplyMap = typename Graph::template NodeMap
    1.12 -				<typename CapacityMap::Value> >
    1.13 +  template < typename Graph,
    1.14 +             typename LowerMap = typename Graph::template EdgeMap<int>,
    1.15 +             typename CapacityMap = LowerMap,
    1.16 +             typename CostMap = typename Graph::template EdgeMap<int>,
    1.17 +             typename SupplyMap = typename Graph::template NodeMap
    1.18 +                                  <typename CapacityMap::Value> >
    1.19    class CycleCanceling
    1.20    {
    1.21      typedef typename Graph::Node Node;
    1.22 @@ -323,12 +323,12 @@
    1.23        if (sum != 0) return false;
    1.24  
    1.25        // Finding a feasible flow
    1.26 -      Circulation< Graph, Capacity, ConstMap<Edge, Capacity>,
    1.27 -	CapacityRefMap, SupplyMap >::DefFlowMap<FlowMap>::Create
    1.28 -	circulation( graph, constMap<Edge>((Capacity)0),
    1.29 -		     capacity, supply);
    1.30 -      circulation.flowMap(flowMap);
    1.31 -      return circulation.run();
    1.32 +      Circulation< Graph, ConstMap<Edge, Capacity>, CapacityRefMap,
    1.33 +		   SupplyMap >
    1.34 +	circulation( graph, constMap<Edge>((Capacity)0), capacity, 
    1.35 +		     supply );
    1.36 +      circulation.flowMap(flow);
    1.37 +      return circulation.run() == -1;
    1.38      }
    1.39  
    1.40  #ifdef LIMITED_CYCLE_CANCELING