Changeset 199:98b93792541e in lemon-0.x for src

Timestamp:

03/18/04 12:35:41 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@277

Message:

.

File:

• src/work/marci/graph_wrapper.h (modified) (7 diffs)

src/work/marci/graph_wrapper.h

@@ -9 +9 @@
   template<typename Graph>
   class TrivGraphWrapper {
+  protected:
     Graph* graph;
   
@@ -88 +89 @@
   class RevGraphWrapper
   {
+  protected:
     Graph* graph;
   
@@ -167 +169 @@
   template<typename Graph>
   class UndirGraphWrapper {
+  protected:
     Graph* graph;
   
@@ -400 +403 @@
     typedef typename Graph::OutEdgeIt OldOutEdgeIt;
     typedef typename Graph::InEdgeIt OldInEdgeIt;
+  protected:
     const Graph* graph;
     FlowMap* flow;
@@ -832 +836 @@
     FilterGraphWrapper(const Graph& _G, FlowMap& _flow, 
                            const CapacityMap& _capacity) : 
-      ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>(_G, _flow, _capacity), dist(*this) { 
+      ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>(_G, _flow, _capacity), dist(*this, graph->nodeNum()) { 
     }
 
     OutEdgeIt& /*getF*/first(OutEdgeIt& e, const Node& n) const {
       ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::/*getF*/first(e, n);
-      while (valid(e) && (dist.get(tail(e))+1!=dist.get(head(e)))) 
+      while (valid(e) && (dist.get(tail(e))/*+1!=*/>=dist.get(head(e)))) 
         ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(e);
       return e;
@@ -848 +852 @@
     OutEdgeIt& next(OutEdgeIt& e) const {
       ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(e);
-      while (valid(e) && (dist.get(tail(e))+1!=dist.get(head(e)))) 
+      while (valid(e) && (dist.get(tail(e))/*+1!*/>=dist.get(head(e)))) 
         ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(e);
       return e;
@@ -860 +864 @@
       OutEdgeIt f(e);
       ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(f);
-      while (valid(f) && (dist.get(tail(f))+1!=dist.get(head(f)))) 
+      while (valid(f) && (dist.get(tail(f))/*+1!=*/>=dist.get(head(f)))) 
         ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::next(f);
       first_out_edges.set(this->tail(e), f);