1.1 --- a/src/work/jacint/preflow.h	Thu Apr 15 08:06:43 2004 +0000
     1.2 +++ b/src/work/jacint/preflow.h	Thu Apr 15 14:41:20 2004 +0000
     1.3 @@ -43,8 +43,8 @@
     1.4  namespace hugo {
     1.5  
     1.6    template <typename Graph, typename T, 
     1.7 -    typename FlowMap=typename Graph::EdgeMap<T>,
     1.8 -    typename CapMap=typename Graph::EdgeMap<T> >
     1.9 +	    typename CapMap=typename Graph::EdgeMap<T>, 
    1.10 +	    typename FlowMap=typename Graph::EdgeMap<T> >
    1.11    class Preflow {
    1.12      
    1.13      typedef typename Graph::Node Node;
    1.14 @@ -56,15 +56,14 @@
    1.15      const Graph& G;
    1.16      Node s;
    1.17      Node t;
    1.18 +    const CapMap& capacity;  
    1.19      FlowMap& flow;
    1.20 -    const CapMap& capacity;  
    1.21      T value;
    1.22  
    1.23    public:
    1.24      Preflow(const Graph& _G, Node _s, Node _t, const CapMap& _capacity, 
    1.25  	    FlowMap& _flow ) :
    1.26 -      G(_G), s(_s), t(_t), flow(_flow), capacity(_capacity) {}
    1.27 -
    1.28 +      G(_G), s(_s), t(_t), capacity(_capacity), flow(_flow) {}
    1.29  
    1.30      void run() {
    1.31