Changeset 2207:75a29ac69c19 in lemon-0.x for benchmark

Timestamp:

09/07/06 15:27:16 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

xy -> dim2::Point

File:

• benchmark/swap_bipartite_bench.cc (modified) (5 diffs)

benchmark/swap_bipartite_bench.cc

@@ -4 +4 @@
 
 #include <lemon/smart_graph.h>
+#include <lemon/list_graph.h>
 
 #include <lemon/bpugraph_adaptor.h>
@@ -9 +10 @@
 
 #include <lemon/graph_utils.h>
-#include <lemon/xy.h>
+#include <lemon/dim2.h>
 #include <lemon/graph_to_eps.h>
 
@@ -18 +19 @@
 
 typedef SmartBpUGraph Graph;
+typedef ListBpUGraph LGraph;
 BPUGRAPH_TYPEDEFS(Graph);
 
@@ -42 +44 @@
     
     Timer nt(false), st(false);
+    Timer lnt(false), lst(false);
     
     for (int i = 0; i < s; ++i) {
       Graph graph;
+      LGraph lgraph;
       vector<Node> aNodes;
       vector<Node> bNodes;  
+      vector<LGraph::Node> laNodes;
+      vector<LGraph::Node> lbNodes;  
       
       for (int i = 0; i < n; ++i) {
         Node node = graph.addANode();
         aNodes.push_back(node);
+        LGraph::Node lnode = lgraph.addANode();
+        laNodes.push_back(lnode);
       }
       for (int i = 0; i < m; ++i) {
         Node node = graph.addBNode();
         bNodes.push_back(node);
+        LGraph::Node lnode = lgraph.addBNode();
+        lbNodes.push_back(lnode);
       }
       for (int i = 0; i < e; ++i) {
-        Node aNode = aNodes[urandom(n)];
-        Node bNode = bNodes[urandom(m)];
+        int a,b;
+        Node aNode = aNodes[a=urandom(n)];
+        Node bNode = bNodes[b=urandom(m)];
         graph.addEdge(aNode, bNode);
+        LGraph::Node laNode = laNodes[a];
+        LGraph::Node lbNode = lbNodes[b];
+        lgraph.addEdge(laNode, lbNode);
       }
 
@@ -82 +96 @@
         st.stop();
         
+      }                 
+      {
+        MaxBipartiteMatching<LGraph> bpmatch(lgraph);
+        
+        lnt.start();
+        bpmatch.init();
+        bpmatch.start();
+        lnt.stop();
+        
       }
-                  
-    }
 
-    cout << k * 100 << ' ' << nt.realTime() << ' ' << st.realTime() << endl;
+      {
+        typedef SwapBpUGraphAdaptor<LGraph> SGraph;
+        SGraph sgraph(lgraph);
+        MaxBipartiteMatching<SGraph> bpmatch(sgraph);
+
+        lst.start();
+        bpmatch.init();
+        bpmatch.start();
+        lst.stop();
+        
+      }
+     }
+
+    cout << k * 100 << ' ' << nt.realTime() << ' ' << st.realTime()
+         << ' ' << lnt.realTime() << ' ' << lst.realTime()<< endl;
 
   }