Changeset 777:a82713ed19f3 in lemon-0.x for src/work/marci/graph_wrapper_time.cc

Timestamp:

08/31/04 19:54:22 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

graph_wrapper.h is ready for hugo 0.2

File:

• src/work/marci/graph_wrapper_time.cc (modified) (4 diffs)

src/work/marci/graph_wrapper_time.cc

@@ -1 +1 @@
 // -*- c++ -*-
+
+// Use a DIMACS max flow file as follows:
+// graph_wrapper_time dimacs_max_flow_file
 
 #include <iostream>
@@ -29 +32 @@
   Timer ts;
   ts.reset();
-  cout << g.nodeNum() << endl;
-  cout << g.edgeNum() << endl;
+
   typedef MaxFlow<Graph, int, FlowMap, FlowMap> MyMaxFlow;
   MyMaxFlow max_flow(g, s, t, cap, flow);
@@ -42 +44 @@
   typedef ListGraph Graph; 
   Graph g;
-//   cout << g.id(g.addNode()) << endl;
-//   cout << g.id(g.addNode()) << endl;
-//   cout << g.nodeNum() << endl;
   timeTest<Graph>(in, g);
   typedef GraphWrapper<Graph> Graph1;
   Graph1 g1(g);
-//   g1.clear();
-//   cout << g.id(g1.addNode()) << endl;
-//   cout << g.id(g1.addNode()) << endl;
-//   cout << g1.nodeNum() << endl;
-//   g1.clear();
   timeTest<Graph1>(in, g1);
   typedef GraphWrapper<Graph1> Graph2;
@@ -60 +54 @@
   Graph3 g3(g2);
   timeTest<Graph3>(in, g3);
-//   typedef GraphWrapper<Graph3> Graph4;
-//   Graph4 g4(g3);
-//   timeTest<Graph4>(in, g4);
-//   typedef GraphWrapper<Graph4> Graph5;
-//   Graph5 g5(g4);
-//   timeTest<Graph5>(in, g5);
-//   typedef GraphWrapper<Graph5> Graph6;
-//   Graph6 g6(g5);
-//   timeTest<Graph6>(in, g6);  
-//   typedef GraphWrapper<Graph6> Graph7;
-//   Graph7 g7(g6);
-//   timeTest<Graph7>(in, g7);
+  typedef GraphWrapper<Graph3> Graph4;
+  Graph4 g4(g3);
+  timeTest<Graph4>(in, g4);
+  typedef GraphWrapper<Graph4> Graph5;
+  Graph5 g5(g4);
+  timeTest<Graph5>(in, g5);
+  typedef GraphWrapper<Graph5> Graph6;
+  Graph6 g6(g5);
+  timeTest<Graph6>(in, g6);  
+  typedef GraphWrapper<Graph6> Graph7;
+  Graph7 g7(g6);
+  timeTest<Graph7>(in, g7);
 
   return 0;