1.1 --- a/src/work/edmonds_karp.hh	Tue Feb 24 16:36:02 2004 +0000
     1.2 +++ b/src/work/edmonds_karp.hh	Tue Feb 24 18:22:53 2004 +0000
     1.3 @@ -12,8 +12,10 @@
     1.4  
     1.5    template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
     1.6    class ResGraph {
     1.7 +  public:
     1.8      typedef typename Graph::NodeIt NodeIt;
     1.9      typedef typename Graph::EachNodeIt EachNodeIt;
    1.10 +  private:
    1.11      typedef typename Graph::SymEdgeIt OldSymEdgeIt;
    1.12      const Graph& G;
    1.13      FlowMap& flow;
    1.14 @@ -118,8 +120,10 @@
    1.15  
    1.16    template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
    1.17    class ResGraph2 {
    1.18 +  public:
    1.19      typedef typename Graph::NodeIt NodeIt;
    1.20      typedef typename Graph::EachNodeIt EachNodeIt;
    1.21 +  private:
    1.22      //typedef typename Graph::SymEdgeIt OldSymEdgeIt;
    1.23      typedef typename Graph::OutEdgeIt OldOutEdgeIt;
    1.24      typedef typename Graph::InEdgeIt OldInEdgeIt;
    1.25 @@ -243,14 +247,14 @@
    1.26  
    1.27    template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
    1.28    class ResGraph3 {
    1.29 -public:
    1.30 +  public:
    1.31      typedef typename Graph::NodeIt NodeIt;
    1.32      typedef typename Graph::EachNodeIt EachNodeIt;
    1.33 +
    1.34 +  private:
    1.35      //typedef typename Graph::SymEdgeIt OldSymEdgeIt;
    1.36      typedef typename Graph::OutEdgeIt OldOutEdgeIt;
    1.37      typedef typename Graph::InEdgeIt OldInEdgeIt;
    1.38 -    
    1.39 -private:
    1.40      const Graph& G;
    1.41      FlowMap& flow;
    1.42      const CapacityMap& capacity;
    1.43 @@ -377,11 +381,14 @@
    1.44  
    1.45    template <typename Graph, typename Number, typename FlowMap, typename CapacityMap>
    1.46    class MaxFlow {
    1.47 +  public:
    1.48      typedef typename Graph::NodeIt NodeIt;
    1.49      typedef typename Graph::EdgeIt EdgeIt;
    1.50      typedef typename Graph::EachEdgeIt EachEdgeIt;
    1.51      typedef typename Graph::OutEdgeIt OutEdgeIt;
    1.52      typedef typename Graph::InEdgeIt InEdgeIt;
    1.53 +
    1.54 +  private:
    1.55      const Graph& G;
    1.56      NodeIt s;
    1.57      NodeIt t;
    1.58 @@ -548,11 +555,13 @@
    1.59    
    1.60    template <typename Graph, typename Number, typename FlowMap, typename CapacityMap>
    1.61    class MaxFlow2 {
    1.62 +  public:
    1.63      typedef typename Graph::NodeIt NodeIt;
    1.64      typedef typename Graph::EdgeIt EdgeIt;
    1.65      typedef typename Graph::EachEdgeIt EachEdgeIt;
    1.66      typedef typename Graph::OutEdgeIt OutEdgeIt;
    1.67      typedef typename Graph::InEdgeIt InEdgeIt;
    1.68 +  private:
    1.69      const Graph& G;
    1.70      std::list<NodeIt>& S;
    1.71      std::list<NodeIt>& T;