Changeset 69:24c2c2989e0f in lemon-0.x for src/work/edmonds_karp.hh

Timestamp:

02/09/04 14:11:10 (19 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

File:

• src/work/edmonds_karp.hh (modified) (4 diffs)

src/work/edmonds_karp.hh

@@ -97 +97 @@
     int id(NodeIt v) const { return G.id(v); }
 
-    template <typename ValueType>
+    template <typename S>
     class NodeMap {
-      typename Graph::NodeMap<ValueType> node_map; 
+      typename Graph::NodeMap<S> node_map; 
     public:
       NodeMap(const ResGraph<Graph, T, FlowMap, CapacityMap>& _G) : node_map(_G.G) { }
-      NodeMap(const ResGraph<Graph, T, FlowMap, CapacityMap>& _G, ValueType a) : node_map(_G.G, a) { }
-      void set(NodeIt nit, ValueType a) { node_map.set(nit, a); }
-      ValueType get(NodeIt nit) const { return node_map.get(nit); }
+      NodeMap(const ResGraph<Graph, T, FlowMap, CapacityMap>& _G, S a) : node_map(_G.G, a) { }
+      void set(NodeIt nit, S a) { node_map.set(nit, a); }
+      S get(NodeIt nit) const { return node_map.get(nit); }
     };
 
@@ -141 +141 @@
       //searching for augmenting path
       while ( !res_bfs.finished() ) { 
-        //std::queue<AugOutEdgeIt> bfs_copy(res_bfs.getBfsQueue());
-        //while (!bfs_copy.empty()) {
-        //  AugOutEdgeIt e=bfs_copy.front();
-        //  bfs_copy.pop();
-        //  if (e.valid()) {
-        //    std::cout<<"queue:"<<res_graph.tail(e)<<"->"<<res_graph.head(e)<<" ";
-        //  } else {
-        //    std::cout<<"queue:"<<res_graph.aNode(e)<<"->"<<" ";
-        //  }
-        //}
-        //std::cout<<std::endl;
         AugOutEdgeIt e=AugOutEdgeIt(res_bfs);
-        //if (e.valid()) {
-        //  std::cout<<"actual:"<<res_graph.tail(e)<<"->"<<res_graph.head(e)<<std::endl;
-        //} else {
-        //  std::cout<<"actual:"<<res_graph.aNode(e)<<"->"<<std::endl;
-        //}
         if (e.valid() && res_bfs.isBNodeNewlyReached()) {
           NodeIt v=res_graph.tail(e);
           NodeIt w=res_graph.head(e);
-          //std::cout<<v<<"->"<<w<<std::endl;
           pred.set(w, e);
           if (pred.get(v).valid()) {
@@ -177 +160 @@
         NodeIt n=t;
         T augment_value=free.get(t);
-        //std::cout<<"augmentation: ";
         while (pred.get(n).valid()) { 
           AugEdgeIt e=pred.get(n);
           e.augment(augment_value); 
-          //std::cout<<"("<<res_graph.tail(e)<< "->"<<res_graph.head(e)<<") ";
           n=res_graph.tail(e);
         }
-        //std::cout<<std::endl;
       }
-      //std::cout << "actual flow: "<< std::endl;
-      //for(EachEdgeIt e=G.template first<EachEdgeIt>(); e.valid(); ++e) { 
-      //std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
-      //}
-      //std::cout<<std::endl;
 
       return _augment;
@@ -197 +172 @@
       while (augment()) { } 
     }
+    T flowValue() { 
+      T a=0;
+      for(OutEdgeIt i=G.template first<OutEdgeIt>(s); i.valid(); ++i) {
+        a+=flow.get(i);
+      }
+      return a;
+    }
   };