Changeset 78:ecc1171307be in lemon-0.x for src/work/jacint/preflow_push_hl.h

Timestamp:

02/16/04 17:15:58 (21 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

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

Message:

modern valtozat

File:

• src/work/jacint/preflow_push_hl.h (modified) (8 diffs)

src/work/jacint/preflow_push_hl.h

@@ -30 +30 @@
 #include <stack>
 
-#include <reverse_bfs.hh>
+#include <reverse_bfs.h>
 
 namespace marci {
 
-  template <typename Graph, typename T, typename FlowMap, typename CapacityMap>
+  template <typename Graph, typename T>
   class preflow_push_hl {
     
@@ -48 +48 @@
     NodeIt s;
     NodeIt t;
-    Graph::EdgeMap<T> flow;
-    Graph::EdgeMap<T> capacity; 
+    typename Graph::EdgeMap<T> flow;
+    typename Graph::EdgeMap<T> capacity; 
     T value;
-    Graph::NodeMap<bool> mincutvector;
+    typename Graph::NodeMap<bool> mincutvector;
 
    
@@ -57 +57 @@
 
     preflow_push_hl(Graph& _G, NodeIt _s, NodeIt _t, 
-                    Graph::EdgeMap<T>& _capacity) :
+                    typename Graph::EdgeMap<T>& _capacity) :
       G(_G), s(_s), t(_t), flow(_G, 0), capacity(_capacity), mincutvector(_G, true) { }
 
@@ -69 +69 @@
     void run() {
  
-      Graph::NodeMap<int> level(G);         //level of Node
-      Graph::NodeMap<T> excess(G);          //excess of Node
+      typename Graph::NodeMap<int> level(G);         //level of Node
+      typename Graph::NodeMap<T> excess(G);          //excess of Node
             
       int n=G.nodeNum();                        //number of Nodes 
@@ -83 +83 @@
       /*Reverse_bfs from t, to find the starting level.*/
 
-      reverse_bfs<list_graph> bfs(G, t);
+      reverse_bfs<Graph> bfs(G, t);
       bfs.run();
       for(EachNodeIt v=G.template first<EachNodeIt>(); v.valid(); ++v) {
@@ -269 +269 @@
     */
 
-    EdgeMap<graph_type, T> allflow() {
+    typename Graph::EdgeMap<T> allflow() {
       return flow;
     }
@@ -279 +279 @@
     */
     
-    NodeMap<graph_type, bool> mincut() {
+    typename Graph::NodeMap<bool> mincut() {
     
       std::queue<NodeIt> queue;
@@ -311 +311 @@
     
     }
-
-
   };
 }//namespace marci