Changeset 199:98b93792541e in lemon0.x for src/work/marci
 Timestamp:
 03/18/04 12:35:41 (20 years ago)
 Branch:
 default
 Phase:
 public
 Convert:
 svn:c9d7d8f590d60310b91f818b3a526b0e/lemon/trunk@277
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

src/work/marci/graph_wrapper.h
r174 r199 9 9 template<typename Graph> 10 10 class TrivGraphWrapper { 11 protected: 11 12 Graph* graph; 12 13 … … 88 89 class RevGraphWrapper 89 90 { 91 protected: 90 92 Graph* graph; 91 93 … … 167 169 template<typename Graph> 168 170 class UndirGraphWrapper { 171 protected: 169 172 Graph* graph; 170 173 … … 400 403 typedef typename Graph::OutEdgeIt OldOutEdgeIt; 401 404 typedef typename Graph::InEdgeIt OldInEdgeIt; 405 protected: 402 406 const Graph* graph; 403 407 FlowMap* flow; … … 832 836 FilterGraphWrapper(const Graph& _G, FlowMap& _flow, 833 837 const CapacityMap& _capacity) : 834 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>(_G, _flow, _capacity), dist(*this ) {838 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>(_G, _flow, _capacity), dist(*this, graph>nodeNum()) { 835 839 } 836 840 837 841 OutEdgeIt& /*getF*/first(OutEdgeIt& e, const Node& n) const { 838 842 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::/*getF*/first(e, n); 839 while (valid(e) && (dist.get(tail(e)) +1!=dist.get(head(e))))843 while (valid(e) && (dist.get(tail(e))/*+1!=*/>=dist.get(head(e)))) 840 844 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(e); 841 845 return e; … … 848 852 OutEdgeIt& next(OutEdgeIt& e) const { 849 853 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(e); 850 while (valid(e) && (dist.get(tail(e)) +1!=dist.get(head(e))))854 while (valid(e) && (dist.get(tail(e))/*+1!*/>=dist.get(head(e)))) 851 855 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(e); 852 856 return e; … … 860 864 OutEdgeIt f(e); 861 865 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(f); 862 while (valid(f) && (dist.get(tail(f)) +1!=dist.get(head(f))))866 while (valid(f) && (dist.get(tail(f))/*+1!=*/>=dist.get(head(f)))) 863 867 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(f); 864 868 first_out_edges.set(this>tail(e), f);
Note: See TracChangeset
for help on using the changeset viewer.