1.1 --- a/test/min_cost_flow_test.cc	Tue May 12 12:09:55 2009 +0100
     1.2 +++ b/test/min_cost_flow_test.cc	Wed May 13 09:50:14 2009 +0100
     1.3 @@ -93,22 +93,24 @@
     1.4    struct Constraints {
     1.5      void constraints() {
     1.6        checkConcept<concepts::Digraph, GR>();
     1.7 +      
     1.8 +      const Constraints& me = *this;
     1.9  
    1.10 -      MCF mcf(g);
    1.11 +      MCF mcf(me.g);
    1.12        const MCF& const_mcf = mcf;
    1.13  
    1.14        b = mcf.reset()
    1.15 -             .lowerMap(lower)
    1.16 -             .upperMap(upper)
    1.17 -             .costMap(cost)
    1.18 -             .supplyMap(sup)
    1.19 -             .stSupply(n, n, k)
    1.20 +             .lowerMap(me.lower)
    1.21 +             .upperMap(me.upper)
    1.22 +             .costMap(me.cost)
    1.23 +             .supplyMap(me.sup)
    1.24 +             .stSupply(me.n, me.n, me.k)
    1.25               .run();
    1.26  
    1.27        c = const_mcf.totalCost();
    1.28        x = const_mcf.template totalCost<double>();
    1.29 -      v = const_mcf.flow(a);
    1.30 -      c = const_mcf.potential(n);
    1.31 +      v = const_mcf.flow(me.a);
    1.32 +      c = const_mcf.potential(me.n);
    1.33        const_mcf.flowMap(fm);
    1.34        const_mcf.potentialMap(pm);
    1.35      }
    1.36 @@ -120,15 +122,16 @@
    1.37      typedef concepts::ReadMap<Arc, Cost> CAM;
    1.38      typedef concepts::WriteMap<Arc, Value> FlowMap;
    1.39      typedef concepts::WriteMap<Node, Cost> PotMap;
    1.40 +  
    1.41 +    GR g;
    1.42 +    VAM lower;
    1.43 +    VAM upper;
    1.44 +    CAM cost;
    1.45 +    NM sup;
    1.46 +    Node n;
    1.47 +    Arc a;
    1.48 +    Value k;
    1.49  
    1.50 -    const GR &g;
    1.51 -    const VAM &lower;
    1.52 -    const VAM &upper;
    1.53 -    const CAM &cost;
    1.54 -    const NM &sup;
    1.55 -    const Node &n;
    1.56 -    const Arc &a;
    1.57 -    const Value &k;
    1.58      FlowMap fm;
    1.59      PotMap pm;
    1.60      bool b;