1.1 --- a/src/work/jacint/prim.cc	Fri Mar 19 21:15:14 2004 +0000
     1.2 +++ b/src/work/jacint/prim.cc	Fri Mar 19 22:16:05 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 <prim.h>
    1.12  #include <time_measure.h>
    1.13  
    1.14 @@ -12,17 +12,17 @@
    1.15  using namespace hugo;
    1.16  
    1.17  int main(int, char **) {
    1.18 -  typedef ListGraph::NodeIt NodeIt;
    1.19 +  typedef ListGraph::Node Node;
    1.20  
    1.21    ListGraph G;
    1.22 -  NodeIt s, t;
    1.23 +  Node s, t;
    1.24    ListGraph::EdgeMap<int> cap(G);
    1.25    readDimacsMaxFlow(std::cin, G, s, t, cap);
    1.26  
    1.27    std::cout << "prim demo ..." << std::endl;
    1.28    
    1.29    double pre_time=currTime();
    1.30 -    Prim<ListGraph, int, FibHeap<ListGraph::NodeIt, int, 
    1.31 +    Prim<ListGraph, int, FibHeap<ListGraph::Node, int, 
    1.32      ListGraph::NodeMap<int> > > prim_test(G, cap);
    1.33      prim_test.run();
    1.34    double post_time=currTime();
    1.35 @@ -31,7 +31,7 @@
    1.36  	    << post_time-pre_time << " sec"<< std::endl; 
    1.37   
    1.38    pre_time=currTime();
    1.39 -  Prim<ListGraph, int, BinHeap<ListGraph::NodeIt, int, 
    1.40 +  Prim<ListGraph, int, BinHeap<ListGraph::Node, int, 
    1.41      ListGraph::NodeMap<int> > > prim_test2(G, cap);
    1.42    prim_test2.run();
    1.43    post_time=currTime();