1.1 --- a/test/kruskal_test.cc	Wed Jul 13 20:02:29 2005 +0000
     1.2 +++ b/test/kruskal_test.cc	Thu Jul 14 12:23:15 2005 +0000
     1.3 @@ -32,9 +32,9 @@
     1.4  {
     1.5    concept::WriteMap<concept::StaticGraph::Edge,bool> w;
     1.6  
     1.7 -  kruskalEdgeMap(concept::StaticGraph(),
     1.8 -		 concept::ReadMap<concept::StaticGraph::Edge,int>(),
     1.9 -		 w);
    1.10 +  kruskal(concept::StaticGraph(),
    1.11 +	  concept::ReadMap<concept::StaticGraph::Edge,int>(),
    1.12 +	  w);
    1.13  }
    1.14  
    1.15  int main() {
    1.16 @@ -72,10 +72,10 @@
    1.17    
    1.18  
    1.19    //Test with const map.
    1.20 -  check(kruskalEdgeMap(G, ConstMap<ListGraph::Edge,int>(2), tree_map)==10,
    1.21 +  check(kruskal(G, ConstMap<ListGraph::Edge,int>(2), tree_map)==10,
    1.22  	"Total cost should be 10");
    1.23    //Test with a edge map (filled with uniform costs).
    1.24 -  check(kruskalEdgeMap(G, edge_cost_map, tree_map)==10,
    1.25 +  check(kruskal(G, edge_cost_map, tree_map)==10,
    1.26  	"Total cost should be 10");
    1.27  
    1.28    edge_cost_map.set(e1, -10);
    1.29 @@ -89,16 +89,23 @@
    1.30    edge_cost_map.set(e9, -2);
    1.31    edge_cost_map.set(e10, -1);
    1.32  
    1.33 -  vector<Edge> tree_edge_vec;
    1.34 +  vector<Edge> tree_edge_vec(5);
    1.35  
    1.36    //Test with a edge map and inserter.
    1.37 -  check(kruskalEdgeMap_IteratorOut(G, edge_cost_map,
    1.38 -				   back_inserter(tree_edge_vec))
    1.39 +  check(kruskal(G, edge_cost_map,
    1.40 +		 tree_edge_vec.begin())
    1.41  	==-31,
    1.42  	"Total cost should be -31.");
    1.43 -
    1.44 +  
    1.45    tree_edge_vec.clear();
    1.46  
    1.47 +  check(kruskal(G, edge_cost_map,
    1.48 +		back_inserter(tree_edge_vec))
    1.49 +	==-31,
    1.50 +	"Total cost should be -31.");
    1.51 +  
    1.52 +  tree_edge_vec.clear();
    1.53 +  
    1.54    //The above test could also be coded like this:
    1.55    check(kruskal(G,
    1.56  		makeKruskalMapInput(G, edge_cost_map),