Changeset 910:5a89cacf17f1 in lemon-0.x for src/hugo/min_cost_flow.h

Timestamp:

09/27/04 20:11:27 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

minor corrections

File:

• src/hugo/min_cost_flow.h (modified) (5 diffs)

src/hugo/min_cost_flow.h

@@ -72 +72 @@
 
 
-    typedef ResGraphWrapper<const Graph,int,CapacityMap,EdgeIntMap> ResGraphType;
-    typedef typename ResGraphType::Edge ResGraphEdge;
+    typedef ResGraphWrapper<const Graph,int,CapacityMap,EdgeIntMap> ResGW;
+    typedef typename ResGW::Edge ResGraphEdge;
 
     class ModLengthMap {   
       typedef typename Graph::template NodeMap<Length> NodeMap;
-      const ResGraphType& G;
+      const ResGW& G;
       const LengthMap &ol;
       const NodeMap &pot;
@@ -84 +84 @@
       typedef typename LengthMap::ValueType ValueType;
         
-      ValueType operator[](typename ResGraphType::Edge e) const {     
+      ValueType operator[](typename ResGW::Edge e) const {     
         if (G.forward(e))
           return  ol[e]-(pot[G.head(e)]-pot[G.tail(e)]);   
@@ -91 +91 @@
       }     
         
-      ModLengthMap(const ResGraphType& _G,
+      ModLengthMap(const ResGW& _G,
                    const LengthMap &o,  const NodeMap &p) : 
         G(_G), /*rev(_rev),*/ ol(o), pot(p){}; 
@@ -153 +153 @@
       
       //We need a residual graph
-      ResGraphType res_graph(G, capacity, flow);
+      ResGW res_graph(G, capacity, flow);
 
 
       ModLengthMap mod_length(res_graph, length, potential);
 
-      Dijkstra<ResGraphType, ModLengthMap> dijkstra(res_graph, mod_length);
+      Dijkstra<ResGW, ModLengthMap> dijkstra(res_graph, mod_length);
 
       int i;
@@ -169 +169 @@
         
         //We have to change the potential
-        for(typename ResGraphType::NodeIt n(res_graph); n!=INVALID; ++n)
+        for(typename ResGW::NodeIt n(res_graph); n!=INVALID; ++n)
           potential[n] += dijkstra.distMap()[n];