diff -r c360666e10e4 -r a0ed1fa1b800 src/work/marci/preflow_demo_athos.cc --- a/src/work/marci/preflow_demo_athos.cc Tue May 04 10:58:42 2004 +0000 +++ b/src/work/marci/preflow_demo_athos.cc Tue May 04 11:20:16 2004 +0000 @@ -1,8 +1,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -11,11 +11,11 @@ // Use a DIMACS max flow file as stdin. // read_dimacs_demo < dimacs_max_flow_file int main(int, char **) { - typedef ListGraph::NodeIt NodeIt; - typedef ListGraph::EachEdgeIt EachEdgeIt; + typedef ListGraph::Node Node; + //typedef ListGraph::EachEdgeIt EachEdgeIt; ListGraph G; - NodeIt s, t; + Node s, t; ListGraph::EdgeMap cap(G); readDimacsMaxFlow(std::cin, G, s, t, cap);