Changeset 660:edb42cb9d352 in lemon-0.x for src/hugo

Timestamp:

05/25/04 15:13:52 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

ResCap?, a map for the residual capacity in ResGraphWrapper?

File:

• src/hugo/graph_wrapper.h (modified) (3 diffs)

src/hugo/graph_wrapper.h

@@ -1462 +1462 @@
     }
 
+    typedef typename Parent::Edge Edge;
+
     //    bool forward(const Parent::Edge& e) const { return Parent::forward(e); }
     //bool backward(const Edge& e) const { return e.backward; }
 
-    void augment(const typename Parent::Edge& e, Number a) const {
+    void augment(const Edge& e, Number a) const {
       if (Parent::forward(e))  
 //      flow->set(e.out, flow->get(e.out)+a);
@@ -1474 +1476 @@
     }
 
-    Number resCap(const typename Parent::Edge& e) const { 
+    /// \deprecated
+    ///
+    Number resCap(const Edge& e) const { 
       if (Parent::forward(e)) 
 //      return (capacity->get(e.out)-flow->get(e.out)); 
@@ -1483 +1487 @@
     }
 
+    /// \brief Residual capacity map.
+    ///
+    /// In generic residual graphs the residual capacity can be obtained as a map.
+    class ResCap {
+    protected:
+      const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>* res_graph;
+    public:
+      typedef Number ValueType;
+      typedef Edge KeyType;
+      ResCap(const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>& _res_graph) : 
+        res_graph(&_res_graph) { }
+      Number operator[](const Edge& e) const { 
+        if (res_graph->forward(e)) 
+          //    return (capacity->get(e.out)-flow->get(e.out)); 
+          return (*(res_graph->capacity))[e]-(*(res_graph->flow))[e]; 
+        else 
+          //    return (flow->get(e.in)); 
+          return (*(res_graph->flow))[e]; 
+      }
+      /// \bug not needed with dynamic maps, or does it?
+      void update() { }
+    };
+
   };
-
-