Changeset 19:3151a1026db9 in lemon-0.x for src/work/marci_max_flow.hh

Timestamp:

01/20/04 18:39:13 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

* empty log message *

File:

• src/work/marci_max_flow.hh (modified) (13 diffs)

src/work/marci_max_flow.hh

@@ -4 +4 @@
 #include <algorithm>
 
-#include <marci_graph_traits.hh>
 #include <marci_property_vector.hh>
 #include <marci_bfs.hh>
@@ -12 +11 @@
   template<typename graph_type, typename T>
   class res_graph_type { 
-    typedef typename graph_traits<graph_type>::node_iterator node_iterator;
-    typedef typename graph_traits<graph_type>::edge_iterator edge_iterator;
-    typedef typename graph_traits<graph_type>::each_node_iterator each_node_iterator;
-    typedef typename graph_traits<graph_type>::sym_edge_iterator sym_edge_iterator;
-
+    typedef typename graph_type::node_iterator node_iterator;
+    typedef typename graph_type::each_node_iterator each_node_iterator;
+    typedef typename graph_type::sym_edge_iterator old_sym_edge_iterator;
     graph_type& G;
     edge_property_vector<graph_type, T>& flow;
@@ -23 +20 @@
     res_graph_type(graph_type& _G, edge_property_vector<graph_type, T>& _flow, edge_property_vector<graph_type, T>& _capacity) : G(_G), flow(_flow), capacity(_capacity) { }
 
-    class res_edge_it {
+    class edge_iterator {
       friend class res_graph_type<graph_type, T>;
     protected:
       res_graph_type<graph_type, T>* resG;
-      sym_edge_iterator sym;
+      old_sym_edge_iterator sym;
     public:
-      res_edge_it() { }
+      edge_iterator() { }
       //bool is_free() {  
       //if (resG->G.a_node(sym)==resG->G.tail(sym)) { 
@@ -44 +41 @@
         }
       }
-      bool is_valid() { return sym.is_valid(); }
+      bool valid() { return sym.valid(); }
       void make_invalid() { sym.make_invalid(); }
       void augment(T a) {
@@ -55 +52 @@
     };
 
-    class res_out_edge_it : public res_edge_it {
+    class out_edge_iterator : public edge_iterator {
     public:
-      res_out_edge_it() { }
-      res_out_edge_it(res_graph_type<graph_type, T>& _resG, const node_iterator& v) { 
+      out_edge_iterator() { }
+      out_edge_iterator(res_graph_type<graph_type, T>& _resG, const node_iterator& v) { 
         resG=&_resG;
         sym=resG->G.first_sym_edge(v);
-        while( sym.is_valid() && !(free()>0) ) { ++sym; }
+        while( sym.valid() && !(free()>0) ) { ++sym; }
       }
-      res_out_edge_it& operator++() { 
+      out_edge_iterator& operator++() { 
         ++sym; 
-        while( sym.is_valid() && !(free()>0) ) { ++sym; }
+        while( sym.valid() && !(free()>0) ) { ++sym; }
         return *this; 
       }
     };
 
-    res_out_edge_it first_out_edge(const node_iterator& v) {
-      return res_out_edge_it(*this, v);
+    out_edge_iterator first_out_edge(const node_iterator& v) {
+      return out_edge_iterator(*this, v);
     }
 
@@ -78 +75 @@
     }
 
-    node_iterator tail(const res_edge_it& e) { return G.a_node(e.sym); }
-    node_iterator head(const res_edge_it& e) { return G.b_node(e.sym); }
+    node_iterator tail(const edge_iterator& e) { return G.a_node(e.sym); }
+    node_iterator head(const edge_iterator& e) { return G.b_node(e.sym); }
 
     int id(const node_iterator& v) { return G.id(v); }
 
     //node_iterator invalid_node() { return G.invalid_node(); }
-    //res_edge_it invalid_edge() { res_edge_it n; n.sym=G.invalid_sym_edge(); return n; }
-    
-  };
-
-  template <typename graph_type, typename T>
-  struct graph_traits< res_graph_type<graph_type, T> > {
-    typedef typename graph_traits<graph_type>::node_iterator node_iterator;
-    typedef typename res_graph_type<graph_type, T>::res_edge_it edge_iterator;
-    typedef typename graph_traits<graph_type>::each_node_iterator each_node_iterator;
-    typedef typename res_graph_type<graph_type, T>::res_out_edge_it out_edge_iterator;
+    //res_edge_it invalid_edge() { res_edge_it n; n.sym=G.invalid_sym_edge(); return n; } 
   };
 
   template <typename graph_type, typename T>
   struct max_flow_type {
-    
-    typedef typename graph_traits<graph_type>::node_iterator node_iterator;
-    typedef typename graph_traits<graph_type>::edge_iterator edge_iterator;
-    typedef typename graph_traits<graph_type>::each_node_iterator each_node_iterator;
-    typedef typename graph_traits<graph_type>::out_edge_iterator out_edge_iterator;
-    typedef typename graph_traits<graph_type>::in_edge_iterator in_edge_iterator;
-
+    typedef typename graph_type::node_iterator node_iterator;
+    typedef typename graph_type::edge_iterator edge_iterator;
+    typedef typename graph_type::each_node_iterator each_node_iterator;
+    typedef typename graph_type::out_edge_iterator out_edge_iterator;
+    typedef typename graph_type::in_edge_iterator in_edge_iterator;
     graph_type& G;
     node_iterator s;
@@ -112 +98 @@
 
     max_flow_type(graph_type& _G, node_iterator _s, node_iterator _t, edge_property_vector<graph_type, T>& _capacity) : G(_G), s(_s), t(_t), flow(_G), capacity(_capacity) { 
-      for(each_node_iterator i=G.first_node(); i.is_valid(); ++i) 
-        for(out_edge_iterator j=G.first_out_edge(i); j.is_valid(); ++j) 
+      for(each_node_iterator i=G.first_node(); i.valid(); ++i) 
+        for(out_edge_iterator j=G.first_out_edge(i); j.valid(); ++j) 
           flow.put(j, 0);
     }
@@ -124 +110 @@
         augment=false;
 
-        typedef std::queue<graph_traits<aug_graph_type>::out_edge_iterator> bfs_queue_type;
+        typedef std::queue<aug_graph_type::out_edge_iterator> bfs_queue_type;
         bfs_queue_type bfs_queue;
         bfs_queue.push(res_graph.first_out_edge(s));
@@ -135 +121 @@
         res_bfs(res_graph, bfs_queue, reached);
 
-        typedef node_property_vector<aug_graph_type, graph_traits<aug_graph_type>::edge_iterator> pred_type;
+        typedef node_property_vector<aug_graph_type, aug_graph_type::edge_iterator> pred_type;
         pred_type pred(res_graph);
-        graph_traits<aug_graph_type>::edge_iterator a; 
+        aug_graph_type::edge_iterator a; 
         a.make_invalid();
         pred.put(s, a);
@@ -145 +131 @@
         
         //searching for augmenting path
-        while ( res_bfs.is_valid() ) { 
+        while ( res_bfs.valid() ) { 
           //std::cout<<"KULSO ciklus itt jar: "<<G.id(res_graph.tail(res_bfs))<<"->"<<G.id(res_graph.head(res_bfs))<<std::endl;
-          if (res_bfs.is_newly_reached()) {
-            graph_traits<aug_graph_type>::edge_iterator e;
+          if (res_bfs.newly_reached()) {
+            aug_graph_type::edge_iterator e;
             e=res_bfs;
             node_iterator v=res_graph.tail(e);
@@ -154 +140 @@
             //std::cout<<G.id(v)<<"->"<<G.id(w)<<", "<<G.id(w)<<" is newly reached";
             pred.put(w, e);
-            if (pred.get(v).is_valid()) {
+            if (pred.get(v).valid()) {
               free.put(w, std::min(free.get(v), e.free()));
               //std::cout <<" nem elso csucs: ";
@@ -174 +160 @@
           T augment_value=free.get(t);
           std::cout<<"augmentation: ";
-          while (pred.get(n).is_valid()) { 
-            graph_traits<aug_graph_type>::edge_iterator e=pred.get(n);
+          while (pred.get(n).valid()) { 
+            aug_graph_type::edge_iterator e=pred.get(n);
             e.augment(augment_value); 
             std::cout<<"("<<res_graph.tail(e)<< "->"<<res_graph.head(e)<<") ";
@@ -184 +170 @@
 
         std::cout << "actual flow: "<< std::endl;
-        for(graph_traits<graph_type>::each_edge_iterator e=G.first_edge(); e.is_valid(); ++e) { 
+        for(typename graph_type::each_edge_iterator e=G.first_edge(); e.valid(); ++e) { 
           std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
         }