Changeset 737:2d867176d10e in lemon-0.x for src/work/johanna/kruskal_test.cc

Timestamp:

07/23/04 19:13:23 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@994

Message:

Several changes in Kruskal alg.

• Input object interface was changed to an STL compatible one.
• template parameters of class KruskalPairVec? has been simplified.
• (the most of) the names meet the naming conventions.
• a lot of (but still not enough) documentation has been added.
• class KruskalMapVec? has been commented out.

File:

• src/work/johanna/kruskal_test.cc (modified) (5 diffs)

src/work/johanna/kruskal_test.cc

@@ -5 +5 @@
 
 #include <kruskal.h>
-#include <list_graph.h>
+#include <hugo/list_graph.h>
 
 
@@ -72 +72 @@
 
   cout << "Uniform 2-es koltseggel: " 
-       << Kruskal_EdgeCostMapIn_BoolMapOut(G, edge_cost_map, tree_map)
+       << kruskalEdgeMap(G, edge_cost_map, tree_map)
        << endl;
 
@@ -90 +90 @@
 
   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;
 
@@ -97 +97 @@
   for(vector<Edge>::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;
   }
 
@@ -108 +108 @@
 //                vec_filler)
 //        << endl;
-  cout << "Nemkonst koltseggel tarhatekonyabban: "
-       << Kruskal(G,
-                  KruskalMapVec<ECostMap>(G, edge_cost_map),
-                  makeSequenceOutput(back_inserter(tree_edge_vec))
-                  )
-       << endl;
 
-  i = 1;
-  for(vector<Edge>::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<ECostMap>(G, edge_cost_map),
+//                makeSequenceOutput(back_inserter(tree_edge_vec))
+//                )
+//        << endl;
 
+//   i = 1;
+//   for(vector<Edge>::iterator e = tree_edge_vec.begin();
+//       e != tree_edge_vec.end(); ++e, ++i) {
+//     cout << i << ". el: " << *e << endl;
+//   }
+
+// **********************************************************************
 
 //   typedef MinCostTreeKruskal<ListGraph, ECostMap, EBoolMap> MCTK;