Changeset 276:b38f4cfa76cf in lemon-0.x for src/work/athos

Timestamp:

04/02/04 16:53:05 (21 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

suurballe fordulo es segfaultolo(!) valtozata

Location:

src/work/athos

Files:

• graph_wrapper.h (copied) (copied from src/work/marci/graph_wrapper.h) (3 diffs)
• suurballe.cc (added)
• suurballe.h (added)

src/work/athos/graph_wrapper.h

@@ -951 +951 @@
     typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/
     GraphWrapper::InEdgeIt OldInEdgeIt;
+
+    typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/
+    GraphWrapper::Edge OldEdge;
   protected:
     //const Graph* graph;
@@ -993 +996 @@
         else
           return (u.out_or_in || u.in!=v.in);
-      } 
+      }
+      operator OldEdge() {
+        if(out_or_in)
+          return out; 
+        else
+          return in;
+      }
     };
 
@@ -1209 +1218 @@
 
     Number resCap(OldOutEdgeIt out) const { 
-      return (capacity->get(out)-flow->get(out)); 
+      return ( (*capacity)[out] - (*flow)[out]); 
     }
     
     Number resCap(OldInEdgeIt in) const { 
-      return (flow->get(in)); 
+      return ( (*flow)[in] ); 
     }