Changeset 194:a1680b3c516c in lemon-0.x for src/work/edmonds_karp.h

Timestamp:

03/17/04 16:09:48 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

File:

• src/work/edmonds_karp.h (modified) (5 diffs)

src/work/edmonds_karp.h

@@ -533 +533 @@
   public:
     typedef typename Graph::Node Node;
+    typedef typename Graph::NodeIt NodeIt;
     typedef typename Graph::Edge Edge;
     typedef typename Graph::EdgeIt EdgeIt;
@@ -564 +565 @@
       for(NodeIt s=G->template first<NodeIt>(); G->valid(s); G->next(s)) {
         Number f=0;
-        for(OutEdgeIt e=G->template first<OutEdgeIt>(); G->valid(e); G->next(e))
+        for(OutEdgeIt e=G->template first<OutEdgeIt>(s); G->valid(e); G->next(e))
           f+=flow->get(e);
         if (f<1) {
@@ -587 +588 @@
             free.set(w, res_graph.free(e)); 
           }
-          if (TMap(res_graph.head(e))) { 
+          if (T->get(res_graph.head(e))) { 
             n=res_graph.head(e);
             _augment=true; 
@@ -599 +600 @@
       if (_augment) {
         //Node n=t;
-        Number augment_value=free.get(t);
+        Number augment_value=free.get(n);
         while (res_graph.valid(pred.get(n))) { 
           AugEdge e=pred.get(n);
@@ -806 +807 @@
       } 
     }
-    template<typename MutableGraph> void run() {
-      //int num_of_augmentations=0;
-      //while (augmentOnShortestPath()) { 
-        while (augmentOnBlockingFlow<MutableGraph>()) { 
-        //std::cout << ++num_of_augmentations << " ";
-        //std::cout<<std::endl;
-      } 
-    }
+//     template<typename MutableGraph> void run() {
+//       //int num_of_augmentations=0;
+//       //while (augmentOnShortestPath()) { 
+//      while (augmentOnBlockingFlow<MutableGraph>()) { 
+//      //std::cout << ++num_of_augmentations << " ";
+//      //std::cout<<std::endl;
+//       } 
+//     } 
     Number flowValue() { 
       Number a=0;
-      OutEdgeIt e;
-      for(G->/*getF*/first(e, s); G->valid(e); G->next(e)) {
+      EdgeIt e;
+      for(G->/*getF*/first(e); G->valid(e); G->next(e)) {
         a+=flow->get(e);
       }