Changeset 197:fff43d9c7110 in lemon-0.x for src/work

Timestamp:

03/17/04 18:04:41 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

Location:

src/work

Files:

• edmonds_karp.h (modified) (4 diffs)
• marci/max_bipartite_matching_demo.cc (modified) (6 diffs)

src/work/edmonds_karp.h

@@ -565 +565 @@
       for(NodeIt s=G->template first<NodeIt>(); G->valid(s); G->next(s)) {
         if (S->get(s)) {
-          Number f=0;
+          Number u=0;
           for(OutEdgeIt e=G->template first<OutEdgeIt>(s); G->valid(e); G->next(e))
-            f+=flow->get(e);
-          if (f<1) {
+            u+=flow->get(e);
+          if (u<1) {
             res_bfs.pushAndSetReached(s);
             pred.set(s, AugEdge(INVALID));
@@ -590 +590 @@
             free.set(w, res_graph.free(e)); 
           }
-          if (T->get(res_graph.head(e))) { 
-            n=res_graph.head(e);
-            _augment=true; 
-            break; 
+          n=res_graph.head(e);
+          if (T->get(n)) { 
+            Number u=0;
+            for(InEdgeIt f=G->template first<InEdgeIt>(n); G->valid(f); G->next(f))
+              u+=flow->get(f);
+            if (u<1) {
+              _augment=true; 
+              break; 
+            }
           }
         }
@@ -621 +626 @@
 //       BfsIterator4< AugGraph, AugOutEdgeIt, ReachedMap > bfs(res_graph);
 
-//       bfs.pushAndSetReached(s);
+
+
+
+
+//       //typename AugGraph::NodeMap<AugEdge> pred(res_graph); 
+//       for(NodeIt s=G->template first<NodeIt>(); G->valid(s); G->next(s)) {
+//      if (S->get(s)) {
+//        Number u=0;
+//        for(OutEdgeIt e=G->template first<OutEdgeIt>(s); G->valid(e); G->next(e))
+//          u+=flow->get(e);
+//        if (u<1) {
+//          res_bfs.pushAndSetReached(s);
+//          //pred.set(s, AugEdge(INVALID));
+//        }
+//      }
+//       }
+
+
+
+
+//       //bfs.pushAndSetReached(s);
 //       typename AugGraph::NodeMap<int> dist(res_graph); //filled up with 0's
 //       while ( !bfs.finished() ) { 
@@ -713 +738 @@
 //       return _augment;
 //     }
-//     bool augmentOnBlockingFlow2() {
-//       bool _augment=false;
-
-//       //typedef ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap> EAugGraph;
-//       typedef FilterGraphWrapper< ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap> > EAugGraph;
-//       typedef typename EAugGraph::OutEdgeIt EAugOutEdgeIt;
-//       typedef typename EAugGraph::Edge EAugEdge;
-
-//       EAugGraph res_graph(*G, *flow, *capacity);
-
-//       //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
-//       BfsIterator4< 
-//      ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, 
-//      typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt, 
-//      ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph);
-      
-//       bfs.pushAndSetReached(s);
-
-//       typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::
-//      NodeMap<int>& dist=res_graph.dist;
-
-//       while ( !bfs.finished() ) {
-//      typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt e=bfs;
-//      if (res_graph.valid(e) && bfs.isBNodeNewlyReached()) {
-//        dist.set(res_graph.head(e), dist.get(res_graph.tail(e))+1);
-//      }
-//      ++bfs;  
-//       } //computing distances from s in the residual graph
-
-//       bool __augment=true;
-
-//       while (__augment) {
-
-//      __augment=false;
-//      //computing blocking flow with dfs
-//      typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap;
-//      DfsIterator4< EAugGraph, EAugOutEdgeIt, BlockingReachedMap > 
-//        dfs(res_graph);
-//      typename EAugGraph::NodeMap<EAugEdge> pred(res_graph); 
-//      pred.set(s, EAugEdge(INVALID));
-//      //invalid iterators for sources
-
-//      typename EAugGraph::NodeMap<Number> free(res_graph);
-
-//      dfs.pushAndSetReached(s);
-//      while (!dfs.finished()) {
-//        ++dfs;
-//        if (res_graph.valid(EAugOutEdgeIt(dfs))) { 
-//          if (dfs.isBNodeNewlyReached()) {
+    bool augmentOnBlockingFlow2() {
+      bool _augment=false;
+
+      //typedef ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap> EAugGraph;
+      typedef FilterGraphWrapper< ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap> > EAugGraph;
+      typedef typename EAugGraph::OutEdgeIt EAugOutEdgeIt;
+      typedef typename EAugGraph::Edge EAugEdge;
+
+      EAugGraph res_graph(*G, *flow, *capacity);
+
+      //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
+      BfsIterator4< 
+        ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, 
+        typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt, 
+        ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph);
+
+
+      //typename AugGraph::NodeMap<AugEdge> pred(res_graph); 
+      for(NodeIt s=G->template first<NodeIt>(); G->valid(s); G->next(s)) {
+        if (S->get(s)) {
+          Number u=0;
+          for(OutEdgeIt e=G->template first<OutEdgeIt>(s); G->valid(e); G->next(e))
+            u+=flow->get(e);
+          if (u<1) {
+            bfs.pushAndSetReached(s);
+            //pred.set(s, AugEdge(INVALID));
+          }
+        }
+      }
+
+      
+      //bfs.pushAndSetReached(s);
+
+      typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::
+        NodeMap<int>& dist=res_graph.dist;
+
+      while ( !bfs.finished() ) {
+        typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt e=bfs;
+        if (res_graph.valid(e) && bfs.isBNodeNewlyReached()) {
+          dist.set(res_graph.head(e), dist.get(res_graph.tail(e))+1);
+        }
+        ++bfs;  
+      } //computing distances from s in the residual graph
+
+      bool __augment=true;
+
+      while (__augment) {
+
+        __augment=false;
+        //computing blocking flow with dfs
+        typedef typename EAugGraph::NodeMap<bool> BlockingReachedMap;
+        DfsIterator4< EAugGraph, EAugOutEdgeIt, BlockingReachedMap > 
+          dfs(res_graph);
+        typename EAugGraph::NodeMap<EAugEdge> pred(res_graph, INVALID); 
+        //pred.set(s, EAugEdge(INVALID));
+        //invalid iterators for sources
+
+        typename EAugGraph::NodeMap<Number> free(res_graph);
+
+
+        //typename AugGraph::NodeMap<AugEdge> pred(res_graph); 
+      for(NodeIt s=G->template first<NodeIt>(); G->valid(s); G->next(s)) {
+        if (S->get(s)) {
+          Number u=0;
+          for(OutEdgeIt e=G->template first<OutEdgeIt>(s); G->valid(e); G->next(e))
+            u+=flow->get(e);
+          if (u<1) {
+            dfs.pushAndSetReached(s);
+            //pred.set(s, AugEdge(INVALID));
+          }
+        }
+      }
+
+
+
+      //dfs.pushAndSetReached(s);
+      typename EAugGraph::Node n;
+        while (!dfs.finished()) {
+          ++dfs;
+          if (res_graph.valid(EAugOutEdgeIt(dfs))) { 
+            if (dfs.isBNodeNewlyReached()) {
           
-//            typename EAugGraph::Node v=res_graph.aNode(dfs);
-//            typename EAugGraph::Node w=res_graph.bNode(dfs);
-
-//            pred.set(w, EAugOutEdgeIt(dfs));
-//            if (res_graph.valid(pred.get(v))) {
-//              free.set(w, std::min(free.get(v), res_graph.free(dfs)));
-//            } else {
-//              free.set(w, res_graph.free(dfs)); 
-//            }
-              
-//            if (w==t) { 
-//              __augment=true; 
-//              _augment=true;
-//              break; 
-//            }
-//          } else {
-//            res_graph.erase(dfs);
-//          }
-//        } 
-
-//      }
-
-//      if (__augment) {
-//        typename EAugGraph::Node n=t;
-//        Number augment_value=free.get(t);
-//        while (res_graph.valid(pred.get(n))) { 
-//          EAugEdge e=pred.get(n);
-//          res_graph.augment(e, augment_value);
-//          n=res_graph.tail(e);
-//          if (res_graph.free(e)==0)
-//            res_graph.erase(e);
-//        }
-//      }
-      
-//       }
+              typename EAugGraph::Node v=res_graph.aNode(dfs);
+              typename EAugGraph::Node w=res_graph.bNode(dfs);
+
+              pred.set(w, EAugOutEdgeIt(dfs));
+              if (res_graph.valid(pred.get(v))) {
+                free.set(w, std::min(free.get(v), res_graph.free(dfs)));
+              } else {
+                free.set(w, res_graph.free(dfs)); 
+              }
+             
+              n=w;
+              if (T->get(w)) {
+                Number u=0;
+                for(InEdgeIt f=G->template first<InEdgeIt>(n); G->valid(f); G->next(f))
+                  u+=flow->get(f);
+                if (u<1) {
+                  __augment=true; 
+                  _augment=true;
+                  break; 
+                }
+              }
+            } else {
+              res_graph.erase(dfs);
+            }
+          } 
+
+        }
+
+        if (__augment) {
+          // typename EAugGraph::Node n=t;
+          Number augment_value=free.get(n);
+          while (res_graph.valid(pred.get(n))) { 
+            EAugEdge e=pred.get(n);
+            res_graph.augment(e, augment_value);
+            n=res_graph.tail(e);
+            if (res_graph.free(e)==0)
+              res_graph.erase(e);
+          }
+        }
+      
+      }
             
-//       return _augment;
-//     }
+      return _augment;
+    }
     void run() {
       //int num_of_augmentations=0;

src/work/marci/max_bipartite_matching_demo.cc

@@ -5 +5 @@
 #include <cstdlib>
 
-//#include <LEDA/graph.h>
-//#include <leda_graph_wrapper.h>
+#include <LEDA/graph.h>
+#include <LEDA/mcb_matching.h>
+#include <LEDA/list.h>
+
+#include <leda_graph_wrapper.h>
 #include <list_graph.h>
 #include <dimacs.h>
@@ -37 +40 @@
 
 using std::cout; 
+using std::cin; 
 using std::endl;
 
 int main() {
-//   leda::graph g;
-//   typedef LedaGraphWrapper<leda::graph> Graph;
-//   Graph G(g);
-  typedef ListGraph Graph;
-  Graph G;
+   leda::graph g;
+   typedef LedaGraphWrapper<leda::graph> Graph;
+   Graph G(g);
+//  typedef ListGraph Graph;
+//  Graph G;
 
   typedef Graph::Node Node;
@@ -59 +63 @@
   std::vector<Node> t_nodes;
 
-  for(int i=0; i<4; ++i) {
+  int a;
+  cout << "number of nodes in the first color class=";
+  cin >> a; 
+  int b;
+  cout << "number of nodes in the second color class=";
+  cin >> b; 
+  int m;
+  cout << "number of edges=";
+  cin >> m; 
+  
+
+  for(int i=0; i<a; ++i) {
     s_nodes.push_back(G.addNode());
   }
-  for(int i=0; i<4; ++i) {
+  for(int i=0; i<a; ++i) {
     t_nodes.push_back(G.addNode());
   }
   random_init();
-  for(int i=0; i<6; ++i) {
-    G.addEdge(s_nodes[random(4)], t_nodes[random(4)]);
-  }
-  
+  for(int i=0; i<m; ++i) {
+    G.addEdge(s_nodes[random(a)], t_nodes[random(b)]);
+  }
+  
+//   G.addEdge(s_nodes[1], t_nodes[5-4]);
+//   G.addEdge(s_nodes[1], t_nodes[5-4]);
+//   G.addEdge(s_nodes[1], t_nodes[4-4]);
+//   G.addEdge(s_nodes[1], t_nodes[4-4]);
 //   G.addEdge(s_nodes[2], t_nodes[4-4]);
-//   G.addEdge(s_nodes[2], t_nodes[7-4]);
-//   G.addEdge(s_nodes[2], t_nodes[4-4]);
-//   G.addEdge(s_nodes[3], t_nodes[6-4]);
-//   G.addEdge(s_nodes[3], t_nodes[5-4]);
-//   G.addEdge(s_nodes[3], t_nodes[5-4]);
+//   G.addEdge(s_nodes[3], t_nodes[4-4]);
 
 
@@ -81 +96 @@
   Graph::NodeMap<bool> t_map(G); //false
   
-  for(int i=0; i<4; ++i) {
-    s_map.set(s_nodes[i], true);
-    t_map.set(t_nodes[i], true);
-  }
-
-  cout << "bfs and dfs iterator demo on the directed graph" << endl;
-  for(NodeIt n=G.first<NodeIt>(); G.valid(n); G.next(n)) { 
-    cout << G.id(n) << ": ";
-    cout << "out edges: ";
-    for(OutEdgeIt e=G.first<OutEdgeIt>(n); G.valid(e); G.next(e)) 
-      cout << G.id(G.tail(e)) << "->" << G.id(G.head(e)) << " ";
-    cout << "in edges: ";
-    for(InEdgeIt e=G.first<InEdgeIt>(n); G.valid(e); G.next(e)) 
-      cout << G.id(G.tail(e)) << "->" << G.id(G.head(e)) << " ";
-    cout << endl;
-  }
+  for(int i=0; i<a; ++i) s_map.set(s_nodes[i], true);
+  for(int i=0; i<b; ++i) t_map.set(t_nodes[i], true);
+
+//   cout << "bfs and dfs iterator demo on the directed graph" << endl;
+//   for(NodeIt n=G.first<NodeIt>(); G.valid(n); G.next(n)) { 
+//     cout << G.id(n) << ": ";
+//     cout << "out edges: ";
+//     for(OutEdgeIt e=G.first<OutEdgeIt>(n); G.valid(e); G.next(e)) 
+//       cout << G.id(G.tail(e)) << "->" << G.id(G.head(e)) << " ";
+//     cout << "in edges: ";
+//     for(InEdgeIt e=G.first<InEdgeIt>(n); G.valid(e); G.next(e)) 
+//       cout << G.id(G.tail(e)) << "->" << G.id(G.head(e)) << " ";
+//     cout << endl;
+//   }
 
 
@@ -108 +121 @@
 
     MaxMatching<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > max_flow_test(G, s_map, t_map, flow, cap);
-    //max_flow_test.augmentWithBlockingFlow<Graph>();
     int i=0;
     while (max_flow_test.augmentOnShortestPath()) { 
-//     for(EdgeIt e=G.template first<EdgeIt>(); e.valid(); ++e) { 
-//       std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
-//     }
-//     std::cout<<std::endl;
+//       for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
+//      std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
+//       std::cout<<std::endl;
       ++i; 
     }
 
-    std::cout << "maximum matching: "<< std::endl;
-    for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
-      if (flow.get(e))
-        std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
-    std::cout<<std::endl;
-    std::cout << "edges which are not in this maximum matching: "<< std::endl;
-    for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
-      if (!flow.get(e))
-        std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
-    std::cout<<std::endl;
+//     std::cout << "maximum matching: "<< std::endl;
+//     for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
+//       if (flow.get(e))
+//      std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
+//     std::cout<<std::endl;
+//     std::cout << "edges which are not in this maximum matching: "<< std::endl;
+//     for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
+//       if (!flow.get(e))
+//      std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
+//     std::cout<<std::endl;
     
     std::cout << "elapsed time: " << ts << std::endl;
@@ -133 +144 @@
     std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
   }
+
+  {
+    std::cout << "on-the-fly max bipartite matching demo (Hopcroft-Karp) on wrapped leda graph..." << std::endl;
+    Graph::EdgeMap<int> flow(G); //0 flow
+    Graph::EdgeMap<int> cap(G, 1);
+
+    Timer ts;
+    ts.reset();
+
+    MaxMatching<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > max_flow_test(G, s_map, t_map, flow, cap);
+    int i=0;
+    while (max_flow_test.augmentOnBlockingFlow2()) { 
+//       for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
+//      std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
+//       std::cout<<std::endl;
+      ++i; 
+    }
+
+//     std::cout << "maximum matching: "<< std::endl;
+//     for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
+//       if (flow.get(e))
+//      std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
+//     std::cout<<std::endl;
+//     std::cout << "edges which are not in this maximum matching: "<< std::endl;
+//     for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
+//       if (!flow.get(e))
+//      std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
+//     std::cout<<std::endl;
+    
+    std::cout << "elapsed time: " << ts << std::endl;
+    std::cout << "number of augmentation phases: " << i << std::endl; 
+    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
+  }
+
+  {
+    std::cout << "max bipartite matching (LEDA)..." << std::endl;
+    //Graph::EdgeMap<int> flow(G); //0 flow
+    //Graph::EdgeMap<int> cap(G, 1);
+
+    Timer ts;
+    ts.reset();
+
+    //MaxMatching<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > max_flow_test(G, s_map, t_map, flow, cap);
+    //int i=0;
+    //while (max_flow_test.augmentOnShortestPath()) { ++i; }
+
+    leda_list<leda_edge> l=MAX_CARD_BIPARTITE_MATCHING(g);    
+    
+
+//     std::cout << "maximum matching: "<< std::endl;
+//     for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
+//       if (flow.get(e))
+//      std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
+//     std::cout<<std::endl;
+//     std::cout << "edges which are not in this maximum matching: "<< std::endl;
+//     for(EdgeIt e=G.first<EdgeIt>(); G.valid(e); G.next(e))  
+//       if (!flow.get(e))
+//      std::cout << G.id(G.tail(e)) << "-" << flow.get(e) << "->" << G.id(G.head(e)) << " ";
+//     std::cout<<std::endl;
+    
+    
+    std::cout << "elapsed time: " << ts << std::endl;
+    //std::cout << "number of augmentation phases: " << i << std::endl; 
+    std::cout << "flow value: "<< l.size() << std::endl;
+  }
+