1.1 --- a/src/work/johanna/kruskal_test.cc	Fri Jul 23 16:58:02 2004 +0000
     1.2 +++ b/src/work/johanna/kruskal_test.cc	Fri Jul 23 17:13:23 2004 +0000
     1.3 @@ -4,7 +4,7 @@
     1.4  #include <vector>
     1.5  
     1.6  #include <kruskal.h>
     1.7 -#include <list_graph.h>
     1.8 +#include <hugo/list_graph.h>
     1.9  
    1.10  
    1.11  using namespace std;
    1.12 @@ -71,7 +71,7 @@
    1.13    
    1.14  
    1.15    cout << "Uniform 2-es koltseggel: " 
    1.16 -       << Kruskal_EdgeCostMapIn_BoolMapOut(G, edge_cost_map, tree_map)
    1.17 +       << kruskalEdgeMap(G, edge_cost_map, tree_map)
    1.18         << endl;
    1.19  
    1.20  
    1.21 @@ -89,14 +89,14 @@
    1.22    vector<Edge> tree_edge_vec;
    1.23  
    1.24    cout << "Nemkonst koltseggel (-31): "
    1.25 -       << Kruskal_EdgeCostMapIn_IteratorOut(G, edge_cost_map,
    1.26 -					    back_inserter(tree_edge_vec))
    1.27 +       << kruskalEdgeMap_IteratorOut(G, edge_cost_map,
    1.28 +				     back_inserter(tree_edge_vec))
    1.29         << endl;
    1.30  
    1.31    int i = 1;
    1.32    for(vector<Edge>::iterator e = tree_edge_vec.begin();
    1.33        e != tree_edge_vec.end(); ++e, ++i) {
    1.34 -    cout << i << ". el: " << *e << endl;
    1.35 +    cout << i << ". el: " << G.id(*e) << endl;
    1.36    }
    1.37  
    1.38    tree_edge_vec.clear();
    1.39 @@ -107,19 +107,21 @@
    1.40  // 		  KruskalMapVec<ECostMap>(G, edge_cost_map),
    1.41  // 		  vec_filler)
    1.42  //        << endl;
    1.43 -  cout << "Nemkonst koltseggel tarhatekonyabban: "
    1.44 -       << Kruskal(G,
    1.45 -		  KruskalMapVec<ECostMap>(G, edge_cost_map),
    1.46 -		  makeSequenceOutput(back_inserter(tree_edge_vec))
    1.47 -		  )
    1.48 -       << endl;
    1.49  
    1.50 -  i = 1;
    1.51 -  for(vector<Edge>::iterator e = tree_edge_vec.begin();
    1.52 -      e != tree_edge_vec.end(); ++e, ++i) {
    1.53 -    cout << i << ". el: " << *e << endl;
    1.54 -  }
    1.55 +//   cout << "Nemkonst koltseggel tarhatekonyabban: "
    1.56 +//        << kruskal(G,
    1.57 +// 		  KruskalMapVec<ECostMap>(G, edge_cost_map),
    1.58 +// 		  makeSequenceOutput(back_inserter(tree_edge_vec))
    1.59 +// 		  )
    1.60 +//        << endl;
    1.61  
    1.62 +//   i = 1;
    1.63 +//   for(vector<Edge>::iterator e = tree_edge_vec.begin();
    1.64 +//       e != tree_edge_vec.end(); ++e, ++i) {
    1.65 +//     cout << i << ". el: " << *e << endl;
    1.66 +//   }
    1.67 +
    1.68 +// **********************************************************************
    1.69  
    1.70  //   typedef MinCostTreeKruskal<ListGraph, ECostMap, EBoolMap> MCTK;
    1.71