1.1 --- a/src/work/marci/preflow_demo_athos.cc	Tue May 04 10:58:42 2004 +0000
     1.2 +++ b/src/work/marci/preflow_demo_athos.cc	Tue May 04 11:20:16 2004 +0000
     1.3 @@ -1,8 +1,8 @@
     1.4  #include <iostream>
     1.5  #include <fstream>
     1.6  
     1.7 -#include <list_graph.hh>
     1.8 -#include <dimacs.hh>
     1.9 +#include <list_graph.h>
    1.10 +#include <dimacs.h>
    1.11  #include <preflow_push.hh>
    1.12  #include <time_measure.h>
    1.13  
    1.14 @@ -11,11 +11,11 @@
    1.15  // Use a DIMACS max flow file as stdin.
    1.16  // read_dimacs_demo < dimacs_max_flow_file
    1.17  int main(int, char **) {
    1.18 -  typedef ListGraph::NodeIt NodeIt;
    1.19 -  typedef ListGraph::EachEdgeIt EachEdgeIt;
    1.20 +  typedef ListGraph::Node Node;
    1.21 +  //typedef ListGraph::EachEdgeIt EachEdgeIt;
    1.22  
    1.23    ListGraph G;
    1.24 -  NodeIt s, t;
    1.25 +  Node s, t;
    1.26    ListGraph::EdgeMap<int> cap(G);
    1.27    readDimacsMaxFlow(std::cin, G, s, t, cap);
    1.28