diff -r ba76a7f56b23 -r 2d867176d10e src/work/johanna/kruskal_test.cc --- a/src/work/johanna/kruskal_test.cc Fri Jul 23 16:58:02 2004 +0000 +++ b/src/work/johanna/kruskal_test.cc Fri Jul 23 17:13:23 2004 +0000 @@ -4,7 +4,7 @@ #include #include -#include +#include using namespace std; @@ -71,7 +71,7 @@ cout << "Uniform 2-es koltseggel: " - << Kruskal_EdgeCostMapIn_BoolMapOut(G, edge_cost_map, tree_map) + << kruskalEdgeMap(G, edge_cost_map, tree_map) << endl; @@ -89,14 +89,14 @@ vector tree_edge_vec; cout << "Nemkonst koltseggel (-31): " - << Kruskal_EdgeCostMapIn_IteratorOut(G, edge_cost_map, - back_inserter(tree_edge_vec)) + << kruskalEdgeMap_IteratorOut(G, edge_cost_map, + back_inserter(tree_edge_vec)) << endl; int i = 1; for(vector::iterator e = tree_edge_vec.begin(); e != tree_edge_vec.end(); ++e, ++i) { - cout << i << ". el: " << *e << endl; + cout << i << ". el: " << G.id(*e) << endl; } tree_edge_vec.clear(); @@ -107,19 +107,21 @@ // KruskalMapVec(G, edge_cost_map), // vec_filler) // << endl; - cout << "Nemkonst koltseggel tarhatekonyabban: " - << Kruskal(G, - KruskalMapVec(G, edge_cost_map), - makeSequenceOutput(back_inserter(tree_edge_vec)) - ) - << endl; - i = 1; - for(vector::iterator e = tree_edge_vec.begin(); - e != tree_edge_vec.end(); ++e, ++i) { - cout << i << ". el: " << *e << endl; - } +// cout << "Nemkonst koltseggel tarhatekonyabban: " +// << kruskal(G, +// KruskalMapVec(G, edge_cost_map), +// makeSequenceOutput(back_inserter(tree_edge_vec)) +// ) +// << endl; +// i = 1; +// for(vector::iterator e = tree_edge_vec.begin(); +// e != tree_edge_vec.end(); ++e, ++i) { +// cout << i << ". el: " << *e << endl; +// } + +// ********************************************************************** // typedef MinCostTreeKruskal MCTK;