1.1 --- a/src/work/marci/graph_wrapper_time.cc	Tue Aug 31 13:40:07 2004 +0000
     1.2 +++ b/src/work/marci/graph_wrapper_time.cc	Tue Aug 31 17:54:22 2004 +0000
     1.3 @@ -1,5 +1,8 @@
     1.4  // -*- c++ -*-
     1.5  
     1.6 +// Use a DIMACS max flow file as follows:
     1.7 +// graph_wrapper_time dimacs_max_flow_file
     1.8 +
     1.9  #include <iostream>
    1.10  #include <fstream>
    1.11  #include <string>
    1.12 @@ -28,8 +31,7 @@
    1.13    readDimacs(is, g, cap, s, t);
    1.14    Timer ts;
    1.15    ts.reset();
    1.16 -  cout << g.nodeNum() << endl;
    1.17 -  cout << g.edgeNum() << endl;
    1.18 +
    1.19    typedef MaxFlow<Graph, int, FlowMap, FlowMap> MyMaxFlow;
    1.20    MyMaxFlow max_flow(g, s, t, cap, flow);
    1.21    max_flow.run(MyMaxFlow::NO_FLOW);
    1.22 @@ -41,17 +43,9 @@
    1.23  
    1.24    typedef ListGraph Graph; 
    1.25    Graph g;
    1.26 -//   cout << g.id(g.addNode()) << endl;
    1.27 -//   cout << g.id(g.addNode()) << endl;
    1.28 -//   cout << g.nodeNum() << endl;
    1.29    timeTest<Graph>(in, g);
    1.30    typedef GraphWrapper<Graph> Graph1;
    1.31    Graph1 g1(g);
    1.32 -//   g1.clear();
    1.33 -//   cout << g.id(g1.addNode()) << endl;
    1.34 -//   cout << g.id(g1.addNode()) << endl;
    1.35 -//   cout << g1.nodeNum() << endl;
    1.36 -//   g1.clear();
    1.37    timeTest<Graph1>(in, g1);
    1.38    typedef GraphWrapper<Graph1> Graph2;
    1.39    Graph2 g2(g1);
    1.40 @@ -59,18 +53,18 @@
    1.41    typedef GraphWrapper<Graph2> Graph3;
    1.42    Graph3 g3(g2);
    1.43    timeTest<Graph3>(in, g3);
    1.44 -//   typedef GraphWrapper<Graph3> Graph4;
    1.45 -//   Graph4 g4(g3);
    1.46 -//   timeTest<Graph4>(in, g4);
    1.47 -//   typedef GraphWrapper<Graph4> Graph5;
    1.48 -//   Graph5 g5(g4);
    1.49 -//   timeTest<Graph5>(in, g5);
    1.50 -//   typedef GraphWrapper<Graph5> Graph6;
    1.51 -//   Graph6 g6(g5);
    1.52 -//   timeTest<Graph6>(in, g6);  
    1.53 -//   typedef GraphWrapper<Graph6> Graph7;
    1.54 -//   Graph7 g7(g6);
    1.55 -//   timeTest<Graph7>(in, g7);
    1.56 +  typedef GraphWrapper<Graph3> Graph4;
    1.57 +  Graph4 g4(g3);
    1.58 +  timeTest<Graph4>(in, g4);
    1.59 +  typedef GraphWrapper<Graph4> Graph5;
    1.60 +  Graph5 g5(g4);
    1.61 +  timeTest<Graph5>(in, g5);
    1.62 +  typedef GraphWrapper<Graph5> Graph6;
    1.63 +  Graph6 g6(g5);
    1.64 +  timeTest<Graph6>(in, g6);  
    1.65 +  typedef GraphWrapper<Graph6> Graph7;
    1.66 +  Graph7 g7(g6);
    1.67 +  timeTest<Graph7>(in, g7);
    1.68  
    1.69    return 0;
    1.70  }