COIN-OR::LEMON - Graph Library

Ignore:
Timestamp:
07/23/04 19:13:23 (17 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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/work/johanna/kruskal_test.cc

    r352 r737  
    55
    66#include <kruskal.h>
    7 #include <list_graph.h>
     7#include <hugo/list_graph.h>
    88
    99
     
    7272
    7373  cout << "Uniform 2-es koltseggel: "
    74        << Kruskal_EdgeCostMapIn_BoolMapOut(G, edge_cost_map, tree_map)
     74       << kruskalEdgeMap(G, edge_cost_map, tree_map)
    7575       << endl;
    7676
     
    9090
    9191  cout << "Nemkonst koltseggel (-31): "
    92        << Kruskal_EdgeCostMapIn_IteratorOut(G, edge_cost_map,
    93                                             back_inserter(tree_edge_vec))
     92       << kruskalEdgeMap_IteratorOut(G, edge_cost_map,
     93                                     back_inserter(tree_edge_vec))
    9494       << endl;
    9595
     
    9797  for(vector<Edge>::iterator e = tree_edge_vec.begin();
    9898      e != tree_edge_vec.end(); ++e, ++i) {
    99     cout << i << ". el: " << *e << endl;
     99    cout << i << ". el: " << G.id(*e) << endl;
    100100  }
    101101
     
    108108//                vec_filler)
    109109//        << endl;
    110   cout << "Nemkonst koltseggel tarhatekonyabban: "
    111        << Kruskal(G,
    112                   KruskalMapVec<ECostMap>(G, edge_cost_map),
    113                   makeSequenceOutput(back_inserter(tree_edge_vec))
    114                   )
    115        << endl;
    116110
    117   i = 1;
    118   for(vector<Edge>::iterator e = tree_edge_vec.begin();
    119       e != tree_edge_vec.end(); ++e, ++i) {
    120     cout << i << ". el: " << *e << endl;
    121   }
     111//   cout << "Nemkonst koltseggel tarhatekonyabban: "
     112//        << kruskal(G,
     113//                KruskalMapVec<ECostMap>(G, edge_cost_map),
     114//                makeSequenceOutput(back_inserter(tree_edge_vec))
     115//                )
     116//        << endl;
    122117
     118//   i = 1;
     119//   for(vector<Edge>::iterator e = tree_edge_vec.begin();
     120//       e != tree_edge_vec.end(); ++e, ++i) {
     121//     cout << i << ". el: " << *e << endl;
     122//   }
     123
     124// **********************************************************************
    123125
    124126//   typedef MinCostTreeKruskal<ListGraph, ECostMap, EBoolMap> MCTK;
Note: See TracChangeset for help on using the changeset viewer.