lemon-0.x: comparison src/work/marci/graph

equal deleted inserted replaced

-:ed5a9882cfd3
+:d7aaa1cd1aa6
 OutEdgeIt(const Edge& e) : Edge(e) { }
 OutEdgeIt(const Invalid& i) : Edge(i) { }
 protected:
 OutEdgeIt(const ResGraphWrapper<GraphWrapper, Number, FlowMap, CapacityMap>& resG, Node v) : Edge() {
 	resG.gw.first(out, v);
-	while( resG.gw.valid(out) && !(resG.free(out)>0) ) { resG.gw.next(out); }
+	while( resG.gw.valid(out) && !(resG.resCap(out)>0) ) { resG.gw.next(out); }
 	if (!resG.gw.valid(out)) {
 	  out_or_in=0;
 	  resG.gw.first(in, v);
-	  while( resG.gw.valid(in) && !(resG.free(in)>0) ) { resG.gw.next(in); }
+	  while( resG.gw.valid(in) && !(resG.resCap(in)>0) ) { resG.gw.next(in); }
 	}
 }
 //     public:
 //       OutEdgeIt& operator++() {
 // 	if (out_or_in) {
 // 	  Node v=/*resG->*/G->aNode(out);
 // 	  ++out;
-// 	  while( out.valid() && !(Edge::free()>0) ) { ++out; }
+// 	  while( out.valid() && !(Edge::resCap()>0) ) { ++out; }
 // 	  if (!out.valid()) {
 // 	    out_or_in=0;
 // 	    G->first(in, v);
-// 	    while( in.valid() && !(Edge::free()>0) ) { ++in; }
+// 	    while( in.valid() && !(Edge::resCap()>0) ) { ++in; }
 // 	  }
 // 	} else {
 // 	  ++in;
-// 	  while( in.valid() && !(Edge::free()>0) ) { ++in; }
+// 	  while( in.valid() && !(Edge::resCap()>0) ) { ++in; }
 // 	}
 // 	return *this;
 //       }
 };
 EdgeIt() { }
 //EdgeIt(const EdgeIt& e) : Edge(e), v(e.v) { }
 EdgeIt(const Invalid& i) : Edge(i) { }
 EdgeIt(const ResGraphWrapper<GraphWrapper, Number, FlowMap, CapacityMap>& resG) : Edge() {
 	resG.gw.first(v);
-	if (resG.gw.valid(v)) resG.gw.first(out, v); else out=/*OldOutEdgeIt*/(INVALID);
+	if (resG.gw.valid(v)) resG.gw.first(out, v); else out=INVALID;
-	while (resG.gw.valid(out) && !(resG.free(out)>0) ) { resG.gw.next(out); }
+	while (resG.gw.valid(out) && !(resG.resCap(out)>0) ) { resG.gw.next(out); }
 	while (resG.gw.valid(v) && !resG.gw.valid(out)) {
 	  resG.gw.next(v);
 	  if (resG.gw.valid(v)) resG.gw.first(out, v);
-	  while (resG.gw.valid(out) && !(resG.free(out)>0) ) { resG.gw.next(out); }
+	  while (resG.gw.valid(out) && !(resG.resCap(out)>0) ) { resG.gw.next(out); }
 	}
 	if (!resG.gw.valid(out)) {
 	  out_or_in=0;
 	  resG.gw.first(v);
-	  if (resG.gw.valid(v)) resG.gw.first(in, v); else in=/*OldInEdgeIt*/(INVALID);
+	  if (resG.gw.valid(v)) resG.gw.first(in, v); else in=INVALID;
-	  while (resG.gw.valid(in) && !(resG.free(in)>0) ) { resG.gw.next(in); }
+	  while (resG.gw.valid(in) && !(resG.resCap(in)>0) ) { resG.gw.next(in); }
 	  while (resG.gw.valid(v) && !resG.gw.valid(in)) {
 	    resG.gw.next(v);
 	    if (resG.gw.valid(v)) resG.gw.first(in, v);
-	    while (resG.gw.valid(in) && !(resG.free(in)>0) ) { resG.gw.next(in); }
+	    while (resG.gw.valid(in) && !(resG.resCap(in)>0) ) { resG.gw.next(in); }
 	  }
 	}
 }
 //       EdgeIt& operator++() {
 // 	if (out_or_in) {
 // 	  ++out;
-// 	  while (out.valid() && !(Edge::free()>0) ) { ++out; }
+// 	  while (out.valid() && !(Edge::resCap()>0) ) { ++out; }
 // 	  while (v.valid() && !out.valid()) {
 // 	    ++v;
 // 	    if (v.valid()) G->first(out, v);
-// 	    while (out.valid() && !(Edge::free()>0) ) { ++out; }
+// 	    while (out.valid() && !(Edge::resCap()>0) ) { ++out; }
 // 	  }
 // 	  if (!out.valid()) {
 // 	    out_or_in=0;
 // 	    G->first(v);
 // 	    if (v.valid()) G->first(in, v); else in=OldInEdgeIt();
-// 	    while (in.valid() && !(Edge::free()>0) ) { ++in; }
+// 	    while (in.valid() && !(Edge::resCap()>0) ) { ++in; }
 // 	    while (v.valid() && !in.valid()) {
 // 	      ++v;
 // 	      if (v.valid()) G->first(in, v);
-// 	      while (in.valid() && !(Edge::free()>0) ) { ++in; }
+// 	      while (in.valid() && !(Edge::resCap()>0) ) { ++in; }
 // 	    }
 // 	  }
 // 	} else {
 // 	  ++in;
-// 	  while (in.valid() && !(Edge::free()>0) ) { ++in; }
+// 	  while (in.valid() && !(Edge::resCap()>0) ) { ++in; }
 // 	  while (v.valid() && !in.valid()) {
 // 	    ++v;
 // 	    if (v.valid()) G->first(in, v);
-// 	    while (in.valid() && !(Edge::free()>0) ) { ++in; }
+// 	    while (in.valid() && !(Edge::resCap()>0) ) { ++in; }
 // 	  }
 // 	}
 // 	return *this;
 //       }
 };
 OutEdgeIt& next(OutEdgeIt& e) const {
 if (e.out_or_in) {
 	Node v=gw.aNode(e.out);
 	gw.next(e.out);
-	while( gw.valid(e.out) && !(free(e.out)>0) ) { gw.next(e.out); }
+	while( gw.valid(e.out) && !(resCap(e.out)>0) ) { gw.next(e.out); }
 	if (!gw.valid(e.out)) {
 	  e.out_or_in=0;
 	  gw.first(e.in, v);
-	  while( gw.valid(e.in) && !(free(e.in)>0) ) { gw.next(e.in); }
+	  while( gw.valid(e.in) && !(resCap(e.in)>0) ) { gw.next(e.in); }
 	}
 } else {
 	gw.next(e.in);
-	while( gw.valid(e.in) && !(free(e.in)>0) ) { gw.next(e.in); }
+	while( gw.valid(e.in) && !(resCap(e.in)>0) ) { gw.next(e.in); }
 }
 return e;
 }
 EdgeIt& next(EdgeIt& e) const {
 if (e.out_or_in) {
 	gw.next(e.out);
-	while (gw.valid(e.out) && !(free(e.out)>0) ) { gw.next(e.out); }
+	while (gw.valid(e.out) && !(resCap(e.out)>0) ) { gw.next(e.out); }
 	  while (gw.valid(e.v) && !gw.valid(e.out)) {
 	    gw.next(e.v);
 	    if (gw.valid(e.v)) gw.first(e.out, e.v);
-	    while (gw.valid(e.out) && !(free(e.out)>0) ) { gw.next(e.out); }
+	    while (gw.valid(e.out) && !(resCap(e.out)>0) ) { gw.next(e.out); }
 	  }
 	  if (!gw.valid(e.out)) {
 	    e.out_or_in=0;
 	    gw.first(e.v);
-	    if (gw.valid(e.v)) gw.first(e.in, e.v); else e.in=/*OldInEdgeIt*/(INVALID);
+	    if (gw.valid(e.v)) gw.first(e.in, e.v); else e.in=INVALID;
-	    while (gw.valid(e.in) && !(free(e.in)>0) ) { gw.next(e.in); }
+	    while (gw.valid(e.in) && !(resCap(e.in)>0) ) { gw.next(e.in); }
 	    while (gw.valid(e.v) && !gw.valid(e.in)) {
 	      gw.next(e.v);
 	      if (gw.valid(e.v)) gw.first(e.in, e.v);
-	      while (gw.valid(e.in) && !(free(e.in)>0) ) { gw.next(e.in); }
+	      while (gw.valid(e.in) && !(resCap(e.in)>0) ) { gw.next(e.in); }
 	    }
 	  }
 	} else {
 	  gw.next(e.in);
-	  while (gw.valid(e.in) && !(free(e.in)>0) ) { gw.next(e.in); }
+	  while (gw.valid(e.in) && !(resCap(e.in)>0) ) { gw.next(e.in); }
 	  while (gw.valid(e.v) && !gw.valid(e.in)) {
 	    gw.next(e.v);
 	    if (gw.valid(e.v)) gw.first(e.in, e.v);
-	    while (gw.valid(e.in) && !(free(e.in)>0) ) { gw.next(e.in); }
+	    while (gw.valid(e.in) && !(resCap(e.in)>0) ) { gw.next(e.in); }
 	  }
 	}
 	return e;
 }
 	flow->set(e.out, flow->get(e.out)+a);
 else
 	flow->set(e.in, flow->get(e.in)-a);
 }
-Number free(const Edge& e) const {
+Number resCap(const Edge& e) const {
 if (e.out_or_in)
 	return (capacity->get(e.out)-flow->get(e.out));
 else
 	return (flow->get(e.in));
 }
-Number free(OldOutEdgeIt out) const {
+Number resCap(OldOutEdgeIt out) const {
 return (capacity->get(out)-flow->get(out));
 }
-Number free(OldInEdgeIt in) const {
+Number resCap(OldInEdgeIt in) const {
 return (flow->get(in));
 }
 //     template<typename T> class NodeMap : public GraphWrapper::NodeMap<T> {
 //     public:
 	  return forward_map.get(e.out);
 	else
 	  return backward_map.get(e.in);
 }
 };
+};
+//Subgraph on the same node-set and partial edge-set
+template<typename GraphWrapper, typename FirstOutEdgesMap>
+class ErasingFirstGraphWrapper : public GraphWrapperSkeleton<GraphWrapper> {
+protected:
+FirstOutEdgesMap* first_out_edges;
+public:
+typedef typename GraphWrapperSkeleton<GraphWrapper>::Node Node;
+typedef typename GraphWrapperSkeleton<GraphWrapper>::NodeIt NodeIt;
+typedef typename GraphWrapperSkeleton<GraphWrapper>::Edge Edge;
+typedef typename GraphWrapperSkeleton<GraphWrapper>::EdgeIt EdgeIt;
+typedef typename GraphWrapperSkeleton<GraphWrapper>::InEdgeIt InEdgeIt;
+typedef typename GraphWrapperSkeleton<GraphWrapper>::OutEdgeIt OutEdgeIt;
+ErasingFirstGraphWrapper(GraphWrapper _gw, FirstOutEdgesMap& _first_out_edges) :
+GraphWrapperSkeleton<GraphWrapper>(_gw), first_out_edges(&_first_out_edges) { }
+template<typename I> I& first(I& i) const {
+gw.first(i);
+//while (gw.valid(i) && !filter_map->get(i)) { gw.next(i); }
+return i;
+}
+OutEdgeIt& first(OutEdgeIt& e, const Node& n) const {
+e=first_out_edges->get(n);
+return e;
+}
+template<typename I, typename P> I& first(I& i, const P& p) const {
+gw.first(i, p);
+//while (gw.valid(i) && !filter_map->get(i)) { gw.next(i); }
+return i;
+}
+//template<typename I> I getNext(const I& i) const {
+//  return gw.getNext(i);
+//}
+template<typename I> I& next(I &i) const {
+gw.next(i);
+//while (gw.valid(i) && !filter_map->get(i)) { gw.next(i); }
+return i;
+}
+template< typename It > It first() const {
+It e; this->first(e); return e; }
+template< typename It > It first(const Node& v) const {
+It e; this->first(e, v); return e; }
+void erase(const OutEdgeIt& e) const {
+OutEdgeIt f=e;
+this->next(f);
+first_out_edges->set(this->tail(e), f);
+}
 };
 //   template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
 //   class ErasingResGraphWrapper : public ResGraphWrapper<Graph, Number, FlowMap, CapacityMap> {
 //   protected:

changeset 271	951cd01495e7
parent 266	4cec4981dfd1
child 275	2dd19df03593