lemon-0.x: comparison src/lemon/preflow.h

equal deleted inserted replaced

-:7e427a6cdf9f
+:1dccbc6f5745
 ///%Preflow algorithms class.
 ///This class provides an implementation of the \e preflow \e
 ///algorithm producing a flow of maximum value in a directed
-///graph. The preflow algorithms are the fastest max flow algorithms
+///graph. The preflow algorithms are the fastest known max flow algorithms
 ///up to now. The \e source node, the \e target node, the \e
 ///capacity of the edges and the \e starting \e flow value of the
 ///edges should be passed to the algorithm through the
 ///constructor. It is possible to change these quantities using the
-///functions \ref setSource, \ref setTarget, \ref setCap and \ref
+///functions \ref source, \ref target, \ref setCap and \ref
 ///setFlow.
 ///
 ///After running \ref lemon::Preflow::phase1() "phase1()"
 ///or \ref lemon::Preflow::run() "run()", the maximal flow
 ///value can be obtained by calling \ref flowValue(). The minimum
 ///the inclusionwise minimum and maximum of the minimum value cuts,
 ///resp.)
 ///
 ///\param Graph The directed graph type the algorithm runs on.
 ///\param Num The number type of the capacities and the flow values.
-///\param CapMap The capacity map type.
+///\param CapacityMap The capacity map type.
 ///\param FlowMap The flow map type.
 ///
 ///\author Jacint Szabo
 template <typename Graph, typename Num,
-	    typename CapMap=typename Graph::template EdgeMap<Num>,
+	    typename CapacityMap=typename Graph::template EdgeMap<Num>,
 typename FlowMap=typename Graph::template EdgeMap<Num> >
 class Preflow {
 protected:
 typedef typename Graph::Node Node;
 typedef typename Graph::NodeIt NodeIt;
 typedef typename Graph::InEdgeIt InEdgeIt;
 typedef typename Graph::template NodeMap<Node> NNMap;
 typedef typename std::vector<Node> VecNode;
-const Graph* g;
+const Graph* _g;
-Node s;
+Node _source;
-Node t;
+Node _target;
-const CapMap* capacity;
+const CapacityMap* _capacity;
-FlowMap* flow;
+FlowMap* _flow;
-int n;      //the number of nodes of G
+int _node_num;      //the number of nodes of G
 typename Graph::template NodeMap<int> level;
 typename Graph::template NodeMap<Num> excess;
 // constants used for heuristics
 public:
 ///Indicates the property of the starting flow map.
-///Indicates the property of the starting flow map. The meanings are as follows:
+///Indicates the property of the starting flow map.
+///The meanings are as follows:
 ///- \c ZERO_FLOW: constant zero flow
 ///- \c GEN_FLOW: any flow, i.e. the sum of the in-flows equals to
 ///the sum of the out-flows in every node except the \e source and
 ///the \e target.
 ///- \c PRE_FLOW: any preflow, i.e. the sum of the in-flows is at
 PRE_FLOW
 };
 ///Indicates the state of the preflow algorithm.
-///Indicates the state of the preflow algorithm. The meanings are as follows:
+///Indicates the state of the preflow algorithm.
-///- \c AFTER_NOTHING: before running the algorithm or at an unspecified state.
+///The meanings are as follows:
+///- \c AFTER_NOTHING: before running the algorithm or
+///  at an unspecified state.
 ///- \c AFTER_PREFLOW_PHASE_1: right after running \c phase1
 ///- \c AFTER_PREFLOW_PHASE_2: after running \ref phase2()
 ///
 enum StatusEnum {
 AFTER_NOTHING,
 ///The constructor of the class.
 ///\param _G The directed graph the algorithm runs on.
 ///\param _s The source node.
 ///\param _t The target node.
-///\param _capacity The capacity of the edges.
+///\param _cap The capacity of the edges.
-///\param _flow The flow of the edges.
+///\param _f The flow of the edges.
 ///Except the graph, all of these parameters can be reset by
-///calling \ref setSource, \ref setTarget, \ref setCap and \ref
+///calling \ref source, \ref target, \ref setCap and \ref
 ///setFlow, resp.
-Preflow(const Graph& _G, Node _s, Node _t,
+Preflow(const Graph& _gr, Node _s, Node _t,
-	      const CapMap& _capacity, FlowMap& _flow) :
+	      const CapacityMap& _cap, FlowMap& _f) :
-	g(&_G), s(_s), t(_t), capacity(&_capacity),
+	_g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
-	flow(&_flow), n(countNodes(_G)), level(_G), excess(_G,0),
+	_flow(&_f), _node_num(countNodes(_gr)), level(_gr), excess(_gr,0),
 	flow_prop(NO_FLOW), status(AFTER_NOTHING) { }
 ///Runs the preflow algorithm.
 ///minCut returns a minimum cut.
 ///\warning \ref minCut(), \ref minMinCut() and \ref maxMinCut() do not
 ///give minimum value cuts unless calling \ref phase2().
 void phase1()
 {
-int heur0=(int)(H0*n);  //time while running 'bound decrease'
+int heur0=(int)(H0*_node_num);  //time while running 'bound decrease'
-int heur1=(int)(H1*n);  //time while running 'highest label'
+int heur1=(int)(H1*_node_num);  //time while running 'highest label'
 int heur=heur1;         //starting time interval (#of relabels)
 int numrelabel=0;
 bool what_heur=1;
 //It is 0 in case 'bound decrease' and 1 in case 'highest label'
 bool end=false;
 //Needed for 'bound decrease', true means no active
 //nodes are above bound b.
-int k=n-2;  //bound on the highest level under n containing a node
+int k=_node_num-2;  //bound on the highest level under n containing a node
 int b=k;    //bound on the highest level under n of an active node
-VecNode first(n, INVALID);
+VecNode first(_node_num, INVALID);
-NNMap next(*g, INVALID);
+NNMap next(*_g, INVALID);
-NNMap left(*g, INVALID);
+NNMap left(*_g, INVALID);
-NNMap right(*g, INVALID);
+NNMap right(*_g, INVALID);
-VecNode level_list(n,INVALID);
+VecNode level_list(_node_num,INVALID);
 //List of the nodes in level i<n, set to n.
 preflowPreproc(first, next, level_list, left, right);
 //Push/relabel on the highest level active nodes.
 //   2 phase
 //   gap
 //   list 'level_list' on the nodes on level i implemented by hand
 //   stack 'active' on the active nodes on level i
 //   runs heuristic 'highest label' for H1*n relabels
-//   runs heuristic 'bound decrease' for H0*n relabels, starts with 'highest label'
+//   runs heuristic 'bound decrease' for H0*n relabels,
+//        starts with 'highest label'
 //   Parameters H0 and H1 are initialized to 20 and 1.
 ///Runs the second phase of the preflow algorithm.
 ///maxMinCut return the inclusionwise minimum and maximum cuts of
 ///minimum value, resp.  \pre \ref phase1 must be called before.
 void phase2()
 {
-int k=n-2;  //bound on the highest level under n containing a node
+int k=_node_num-2;  //bound on the highest level under n containing a node
 int b=k;    //bound on the highest level under n of an active node
-VecNode first(n, INVALID);
+VecNode first(_node_num, INVALID);
-NNMap next(*g, INVALID);
+NNMap next(*_g, INVALID);
-level.set(s,0);
+level.set(_source,0);
 std::queue<Node> bfs_queue;
-bfs_queue.push(s);
+bfs_queue.push(_source);
 while ( !bfs_queue.empty() ) {
 	Node v=bfs_queue.front();
 	bfs_queue.pop();
 	int l=level[v]+1;
-	for(InEdgeIt e(*g,v); e!=INVALID; ++e) {
+	for(InEdgeIt e(*_g,v); e!=INVALID; ++e) {
-	  if ( (*capacity)[e] <= (*flow)[e] ) continue;
+	  if ( (*_capacity)[e] <= (*_flow)[e] ) continue;
-	  Node u=g->source(e);
+	  Node u=_g->source(e);
-	  if ( level[u] >= n ) {
+	  if ( level[u] >= _node_num ) {
 	    bfs_queue.push(u);
 	    level.set(u, l);
 	    if ( excess[u] > 0 ) {
 	      next.set(u,first[l]);
 	      first[l]=u;
 	    }
 	  }
 	}
-	for(OutEdgeIt e(*g,v); e!=INVALID; ++e) {
+	for(OutEdgeIt e(*_g,v); e!=INVALID; ++e) {
-	  if ( 0 >= (*flow)[e] ) continue;
+	  if ( 0 >= (*_flow)[e] ) continue;
-	  Node u=g->target(e);
+	  Node u=_g->target(e);
-	  if ( level[u] >= n ) {
+	  if ( level[u] >= _node_num ) {
 	    bfs_queue.push(u);
 	    level.set(u, l);
 	    if ( excess[u] > 0 ) {
 	      next.set(u,first[l]);
 	      first[l]=u;
 	    }
 	  }
 	}
 }
-b=n-2;
+b=_node_num-2;
 while ( true ) {
 	if ( b == 0 ) break;
 	if ( first[b]==INVALID ) --b;
 /// Returns the value of the maximum flow by returning the excess
 /// of the target node \c t. This value equals to the value of
 /// the maximum flow already after running \ref phase1.
 Num flowValue() const {
-return excess[t];
+return excess[_target];
 }
 ///Returns a minimum value cut.
 ///be initialized to false.
 template<typename _CutMap>
 void minCut(_CutMap& M) const {
 switch ( status ) {
 	case AFTER_PREFLOW_PHASE_1:
-	for(NodeIt v(*g); v!=INVALID; ++v) {
+	for(NodeIt v(*_g); v!=INVALID; ++v) {
-	  if (level[v] < n) {
+	  if (level[v] < _node_num) {
 	    M.set(v, false);
 	  } else {
 	    M.set(v, true);
 	  }
 	}
 ///phase2 should already be run.
 template<typename _CutMap>
 void minMinCut(_CutMap& M) const {
 std::queue<Node> queue;
-M.set(s,true);
+M.set(_source,true);
 queue.push(s);
 while (!queue.empty()) {
 	Node w=queue.front();
 	queue.pop();
-	for(OutEdgeIt e(*g,w) ; e!=INVALID; ++e) {
+	for(OutEdgeIt e(*_g,w) ; e!=INVALID; ++e) {
-	  Node v=g->target(e);
+	  Node v=_g->target(e);
-	  if (!M[v] && (*flow)[e] < (*capacity)[e] ) {
+	  if (!M[v] && (*_flow)[e] < (*_capacity)[e] ) {
 	    queue.push(v);
 	    M.set(v, true);
 	  }
 	}
-	for(InEdgeIt e(*g,w) ; e!=INVALID; ++e) {
+	for(InEdgeIt e(*_g,w) ; e!=INVALID; ++e) {
-	  Node v=g->source(e);
+	  Node v=_g->source(e);
-	  if (!M[v] && (*flow)[e] > 0 ) {
+	  if (!M[v] && (*_flow)[e] > 0 ) {
 	    queue.push(v);
 	    M.set(v, true);
 	  }
 	}
 }
 ///backward bfs from the target node \c t in the residual graph.
 ///\pre \ref phase2() or run() should already be run.
 template<typename _CutMap>
 void maxMinCut(_CutMap& M) const {
-for(NodeIt v(*g) ; v!=INVALID; ++v) M.set(v, true);
+for(NodeIt v(*_g) ; v!=INVALID; ++v) M.set(v, true);
 std::queue<Node> queue;
-M.set(t,false);
+M.set(_target,false);
-queue.push(t);
+queue.push(_target);
 while (!queue.empty()) {
 Node w=queue.front();
 	queue.pop();
-	for(InEdgeIt e(*g,w) ; e!=INVALID; ++e) {
+	for(InEdgeIt e(*_g,w) ; e!=INVALID; ++e) {
-	  Node v=g->source(e);
+	  Node v=_g->source(e);
-	  if (M[v] && (*flow)[e] < (*capacity)[e] ) {
+	  if (M[v] && (*_flow)[e] < (*_capacity)[e] ) {
 	    queue.push(v);
 	    M.set(v, false);
 	  }
 	}
-	for(OutEdgeIt e(*g,w) ; e!=INVALID; ++e) {
+	for(OutEdgeIt e(*_g,w) ; e!=INVALID; ++e) {
-	  Node v=g->target(e);
+	  Node v=_g->target(e);
-	  if (M[v] && (*flow)[e] > 0 ) {
+	  if (M[v] && (*_flow)[e] > 0 ) {
 	    queue.push(v);
 	    M.set(v, false);
 	  }
 	}
 }
 ///Sets the source node to \c _s.
 ///Sets the source node to \c _s.
 ///
-void setSource(Node _s) {
+void source(Node _s) {
-s=_s;
+_source=_s;
 if ( flow_prop != ZERO_FLOW ) flow_prop=NO_FLOW;
 status=AFTER_NOTHING;
 }
+///Returns the source node.
+///Returns the source node.
+///
+Node source() const {
+return _source;
+}
 ///Sets the target node to \c _t.
 ///Sets the target node to \c _t.
 ///
-void setTarget(Node _t) {
+void target(Node _t) {
-t=_t;
+_target=_t;
 if ( flow_prop == GEN_FLOW ) flow_prop=PRE_FLOW;
 status=AFTER_NOTHING;
 }
+///Returns the target node.
+///Returns the target node.
+///
+Node target() const {
+return _target;
+}
 /// Sets the edge map of the capacities to _cap.
 /// Sets the edge map of the capacities to _cap.
 ///
-void setCap(const CapMap& _cap) {
+void capacityMap(const CapacityMap& _cap) {
-capacity=&_cap;
+_capacity=&_cap;
 status=AFTER_NOTHING;
+}
+/// Returns a reference to to capacity map.
+/// Returns a reference to to capacity map.
+///
+const CapacityMap &capacityMap() const {
+return *_capacity;
 }
 /// Sets the edge map of the flows to _flow.
 /// Sets the edge map of the flows to _flow.
 ///
-void setFlow(FlowMap& _flow) {
+void flowMap(FlowMap& _f) {
-flow=&_flow;
+_flow=&_f;
 flow_prop=NO_FLOW;
 status=AFTER_NOTHING;
 }
+/// Returns a reference to to flow map.
+/// Returns a reference to to flow map.
+///
+const FlowMap &flowMap() const {
+return *_flow;
+}
 private:
 int push(Node w, NNMap& next, VecNode& first) {
 int lev=level[w];
 Num exc=excess[w];
-int newlevel=n;       //bound on the next level of w
+int newlevel=_node_num;       //bound on the next level of w
-for(OutEdgeIt e(*g,w) ; e!=INVALID; ++e) {
+for(OutEdgeIt e(*_g,w) ; e!=INVALID; ++e) {
-	if ( (*flow)[e] >= (*capacity)[e] ) continue;
+	if ( (*_flow)[e] >= (*_capacity)[e] ) continue;
-	Node v=g->target(e);
+	Node v=_g->target(e);
 	if( lev > level[v] ) { //Push is allowed now
-	  if ( excess[v]<=0 && v!=t && v!=s ) {
+	  if ( excess[v]<=0 && v!=_target && v!=_source ) {
 	    next.set(v,first[level[v]]);
 	    first[level[v]]=v;
 	  }
-	  Num cap=(*capacity)[e];
+	  Num cap=(*_capacity)[e];
-	  Num flo=(*flow)[e];
+	  Num flo=(*_flow)[e];
 	  Num remcap=cap-flo;
 	  if ( remcap >= exc ) { //A nonsaturating push.
-	    flow->set(e, flo+exc);
+	    _flow->set(e, flo+exc);
 	    excess.set(v, excess[v]+exc);
 	    exc=0;
 	    break;
 	  } else { //A saturating push.
-	    flow->set(e, cap);
+	    _flow->set(e, cap);
 	    excess.set(v, excess[v]+remcap);
 	    exc-=remcap;
 	  }
 	} else if ( newlevel > level[v] ) newlevel = level[v];
 } //for out edges wv
 if ( exc > 0 ) {
-	for(InEdgeIt e(*g,w) ; e!=INVALID; ++e) {
+	for(InEdgeIt e(*_g,w) ; e!=INVALID; ++e) {
-	  if( (*flow)[e] <= 0 ) continue;
+	  if( (*_flow)[e] <= 0 ) continue;
-	  Node v=g->source(e);
+	  Node v=_g->source(e);
 	  if( lev > level[v] ) { //Push is allowed now
-	    if ( excess[v]<=0 && v!=t && v!=s ) {
+	    if ( excess[v]<=0 && v!=_target && v!=_source ) {
 	      next.set(v,first[level[v]]);
 	      first[level[v]]=v;
 	    }
-	    Num flo=(*flow)[e];
+	    Num flo=(*_flow)[e];
 	    if ( flo >= exc ) { //A nonsaturating push.
-	      flow->set(e, flo-exc);
+	      _flow->set(e, flo-exc);
 	      excess.set(v, excess[v]+exc);
 	      exc=0;
 	      break;
 	    } else {  //A saturating push.
 	      excess.set(v, excess[v]+flo);
 	      exc-=flo;
-	      flow->set(e,0);
+	      _flow->set(e,0);
 	    }
 	  } else if ( newlevel > level[v] ) newlevel = level[v];
 	} //for in edges vw
 } // if w still has excess after the out edge for cycle
 void preflowPreproc(VecNode& first, NNMap& next,
 			VecNode& level_list, NNMap& left, NNMap& right)
 {
-for(NodeIt v(*g); v!=INVALID; ++v) level.set(v,n);
+for(NodeIt v(*_g); v!=INVALID; ++v) level.set(v,_node_num);
 std::queue<Node> bfs_queue;
 if ( flow_prop == GEN_FLOW || flow_prop == PRE_FLOW ) {
 	//Reverse_bfs from t in the residual graph,
 	//to find the starting level.
-	level.set(t,0);
+	level.set(_target,0);
-	bfs_queue.push(t);
+	bfs_queue.push(_target);
 	while ( !bfs_queue.empty() ) {
 	  Node v=bfs_queue.front();
 	  bfs_queue.pop();
 	  int l=level[v]+1;
-	  for(InEdgeIt e(*g,v) ; e!=INVALID; ++e) {
+	  for(InEdgeIt e(*_g,v) ; e!=INVALID; ++e) {
-	    if ( (*capacity)[e] <= (*flow)[e] ) continue;
+	    if ( (*_capacity)[e] <= (*_flow)[e] ) continue;
-	    Node w=g->source(e);
+	    Node w=_g->source(e);
-	    if ( level[w] == n && w != s ) {
+	    if ( level[w] == _node_num && w != _source ) {
 	      bfs_queue.push(w);
 	      Node z=level_list[l];
 	      if ( z!=INVALID ) left.set(z,w);
 	      right.set(w,z);
 	      level_list[l]=w;
 	      level.set(w, l);
 	    }
 	  }
-	  for(OutEdgeIt e(*g,v) ; e!=INVALID; ++e) {
+	  for(OutEdgeIt e(*_g,v) ; e!=INVALID; ++e) {
-	    if ( 0 >= (*flow)[e] ) continue;
+	    if ( 0 >= (*_flow)[e] ) continue;
-	    Node w=g->target(e);
+	    Node w=_g->target(e);
-	    if ( level[w] == n && w != s ) {
+	    if ( level[w] == _node_num && w != _source ) {
 	      bfs_queue.push(w);
 	      Node z=level_list[l];
 	      if ( z!=INVALID ) left.set(z,w);
 	      right.set(w,z);
 	      level_list[l]=w;
 } //if
 switch (flow_prop) {
 	case NO_FLOW:
-	for(EdgeIt e(*g); e!=INVALID; ++e) flow->set(e,0);
+	for(EdgeIt e(*_g); e!=INVALID; ++e) _flow->set(e,0);
 	case ZERO_FLOW:
-	for(NodeIt v(*g); v!=INVALID; ++v) excess.set(v,0);
+	for(NodeIt v(*_g); v!=INVALID; ++v) excess.set(v,0);
 	//Reverse_bfs from t, to find the starting level.
-	level.set(t,0);
+	level.set(_target,0);
-	bfs_queue.push(t);
+	bfs_queue.push(_target);
 	while ( !bfs_queue.empty() ) {
 	  Node v=bfs_queue.front();
 	  bfs_queue.pop();
 	  int l=level[v]+1;
-	  for(InEdgeIt e(*g,v) ; e!=INVALID; ++e) {
+	  for(InEdgeIt e(*_g,v) ; e!=INVALID; ++e) {
-	    Node w=g->source(e);
+	    Node w=_g->source(e);
-	    if ( level[w] == n && w != s ) {
+	    if ( level[w] == _node_num && w != _source ) {
 	      bfs_queue.push(w);
 	      Node z=level_list[l];
 	      if ( z!=INVALID ) left.set(z,w);
 	      right.set(w,z);
 	      level_list[l]=w;
 	    }
 	  }
 	}
 	//the starting flow
-	for(OutEdgeIt e(*g,s) ; e!=INVALID; ++e) {
+	for(OutEdgeIt e(*_g,_source) ; e!=INVALID; ++e) {
-	  Num c=(*capacity)[e];
+	  Num c=(*_capacity)[e];
 	  if ( c <= 0 ) continue;
-	  Node w=g->target(e);
+	  Node w=_g->target(e);
-	  if ( level[w] < n ) {
+	  if ( level[w] < _node_num ) {
-	    if ( excess[w] <= 0 && w!=t ) { //putting into the stack
+	    if ( excess[w] <= 0 && w!=_target ) { //putting into the stack
 	      next.set(w,first[level[w]]);
 	      first[level[w]]=w;
 	    }
-	    flow->set(e, c);
+	    _flow->set(e, c);
 	    excess.set(w, excess[w]+c);
 	  }
 	}
 	break;
 	case GEN_FLOW:
-	for(NodeIt v(*g); v!=INVALID; ++v) excess.set(v,0);
+	for(NodeIt v(*_g); v!=INVALID; ++v) excess.set(v,0);
 	{
 	  Num exc=0;
-	  for(InEdgeIt e(*g,t) ; e!=INVALID; ++e) exc+=(*flow)[e];
+	  for(InEdgeIt e(*_g,_target) ; e!=INVALID; ++e) exc+=(*_flow)[e];
-	  for(OutEdgeIt e(*g,t) ; e!=INVALID; ++e) exc-=(*flow)[e];
+	  for(OutEdgeIt e(*_g,_target) ; e!=INVALID; ++e) exc-=(*_flow)[e];
-	  excess.set(t,exc);
+	  excess.set(_target,exc);
 	}
 	//the starting flow
-	for(OutEdgeIt e(*g,s); e!=INVALID; ++e)	{
+	for(OutEdgeIt e(*_g,_source); e!=INVALID; ++e)	{
-	  Num rem=(*capacity)[e]-(*flow)[e];
+	  Num rem=(*_capacity)[e]-(*_flow)[e];
 	  if ( rem <= 0 ) continue;
-	  Node w=g->target(e);
+	  Node w=_g->target(e);
-	  if ( level[w] < n ) {
+	  if ( level[w] < _node_num ) {
-	    if ( excess[w] <= 0 && w!=t ) { //putting into the stack
+	    if ( excess[w] <= 0 && w!=_target ) { //putting into the stack
 	      next.set(w,first[level[w]]);
 	      first[level[w]]=w;
 	    }
-	    flow->set(e, (*capacity)[e]);
+	    _flow->set(e, (*_capacity)[e]);
 	    excess.set(w, excess[w]+rem);
 	  }
 	}
-	for(InEdgeIt e(*g,s); e!=INVALID; ++e) {
+	for(InEdgeIt e(*_g,_source); e!=INVALID; ++e) {
-	  if ( (*flow)[e] <= 0 ) continue;
+	  if ( (*_flow)[e] <= 0 ) continue;
-	  Node w=g->source(e);
+	  Node w=_g->source(e);
-	  if ( level[w] < n ) {
+	  if ( level[w] < _node_num ) {
-	    if ( excess[w] <= 0 && w!=t ) {
+	    if ( excess[w] <= 0 && w!=_target ) {
 	      next.set(w,first[level[w]]);
 	      first[level[w]]=w;
 	    }
-	    excess.set(w, excess[w]+(*flow)[e]);
+	    excess.set(w, excess[w]+(*_flow)[e]);
-	    flow->set(e, 0);
+	    _flow->set(e, 0);
 	  }
 	}
 	break;
 	case PRE_FLOW:
 	//the starting flow
-	for(OutEdgeIt e(*g,s) ; e!=INVALID; ++e) {
+	for(OutEdgeIt e(*_g,_source) ; e!=INVALID; ++e) {
-	  Num rem=(*capacity)[e]-(*flow)[e];
+	  Num rem=(*_capacity)[e]-(*_flow)[e];
 	  if ( rem <= 0 ) continue;
-	  Node w=g->target(e);
+	  Node w=_g->target(e);
-	  if ( level[w] < n ) flow->set(e, (*capacity)[e]);
+	  if ( level[w] < _node_num ) _flow->set(e, (*_capacity)[e]);
 	}
-	for(InEdgeIt e(*g,s) ; e!=INVALID; ++e) {
+	for(InEdgeIt e(*_g,_source) ; e!=INVALID; ++e) {
-	  if ( (*flow)[e] <= 0 ) continue;
+	  if ( (*_flow)[e] <= 0 ) continue;
-	  Node w=g->source(e);
+	  Node w=_g->source(e);
-	  if ( level[w] < n ) flow->set(e, 0);
+	  if ( level[w] < _node_num ) _flow->set(e, 0);
 	}
 	//computing the excess
-	for(NodeIt w(*g); w!=INVALID; ++w) {
+	for(NodeIt w(*_g); w!=INVALID; ++w) {
 	  Num exc=0;
-	  for(InEdgeIt e(*g,w); e!=INVALID; ++e) exc+=(*flow)[e];
+	  for(InEdgeIt e(*_g,w); e!=INVALID; ++e) exc+=(*_flow)[e];
-	  for(OutEdgeIt e(*g,w); e!=INVALID; ++e) exc-=(*flow)[e];
+	  for(OutEdgeIt e(*_g,w); e!=INVALID; ++e) exc-=(*_flow)[e];
 	  excess.set(w,exc);
 	  //putting the active nodes into the stack
 	  int lev=level[w];
-	    if ( exc > 0 && lev < n && Node(w) != t ) {
+	    if ( exc > 0 && lev < _node_num && Node(w) != _target ) {
 	      next.set(w,first[lev]);
 	      first[lev]=w;
 	    }
 	}
 	break;
 	//gapping starts
 	for (int i=lev; i!=k ; ) {
 	  Node v=level_list[++i];
 	  while ( v!=INVALID ) {
-	    level.set(v,n);
+	    level.set(v,_node_num);
 	    v=right[v];
 	  }
 	  level_list[i]=INVALID;
 	  if ( !what_heur ) first[i]=INVALID;
 	}
-	level.set(w,n);
+	level.set(w,_node_num);
 	b=lev-1;
 	k=b;
 	//gapping ends
 } else {
-	if ( newlevel == n ) level.set(w,n);
+	if ( newlevel == _node_num ) level.set(w,_node_num);
 	else {
 	  level.set(w,++newlevel);
 	  next.set(w,first[newlevel]);
 	  first[newlevel]=w;
 	  if ( what_heur ) b=newlevel;

changeset 1225	4401e1aeafcf
parent 1164	80bb73097736
child 1227	01f668e3e168