Changeset 751:e742d383fffc in lemon-0.x

Timestamp:

08/04/04 20:51:51 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• Trimmed in order to work with gcc-3.4
• The number of executions of the tests can be controlled by command arg.

File:

• src/benchmark/bfs-bench.cc (modified) (6 diffs)

src/benchmark/bfs-bench.cc

@@ -39 +39 @@
   using namespace std;
   
-  typename Graph::NodeMap<bool> visited(G,false);
+  typename Graph::template NodeMap<bool> visited(G,false);
     
   queue<typename Graph::Node> Q;
@@ -64 +64 @@
   using namespace std;
   
-  typename Graph::NodeMap<bool> visited(G,false);
+  typename Graph::template NodeMap<bool> visited(G,false);
   
   int N=G.nodeNum();
@@ -85 +85 @@
 }
 
+template<class Graph>
+void iteratorBench(Graph &G)
+{
+  GRAPH_TYPEDEF_FACTORY(Graph);
+
+  int i=0;
+  
+  for(NodeIt n(G);G.valid(n);G.next(n))
+    for(OutEdgeIt e(G,n);G.valid(e);G.next(e))
+      i++;
+}
+
 int main(int argc, char *argv[])
 {
@@ -97 +109 @@
   Timer T;
   
-  if(argc!=2) {
-    cout << "Usage: " << argv[0] << " dim\n";
+  if(argc!=3) {
+    cout << "Usage: " << argv[0] << " dim mul\n";
     return 1;
   }
   
   int dim=atoi(argv[1]);
+  int mul=atoi(argv[2]);
   
 //   cout << "Creating Hipercube ("<< (1<<dim) << " nodes, "
@@ -115 +128 @@
   T.reset();
   {
-    for(int i=0;i<50000;i++)
+    for(int i=0;i<mul;i++)
       bfsStlQueue(G,nodes[0]);
   }
@@ -121 +134 @@
   T.reset();
   {
-    for(int i=0;i<50000;i++)
+    for(int i=0;i<mul;i++)
       bfsOwnQueue(G,nodes[0]);
   }
   PrintTime("BFS-OWN",T);
+  T.reset();
+  {
+    for(int i=0;i<mul;i++)
+      iteratorBench(G);
+  }
+  PrintTime("ITERATE",T);
+
+
 }