1.1 --- a/src/work/athos/union_find.h	Sat Nov 13 12:53:28 2004 +0000
     1.2 +++ b/src/work/athos/union_find.h	Sat Nov 13 17:07:10 2004 +0000
     1.3 @@ -15,7 +15,7 @@
     1.4  
     1.5  namespace lemon {
     1.6    
     1.7 -  template <typename KeyType, typename KeyIntMap>
     1.8 +  template <typename Key, typename KeyIntMap>
     1.9      class UnionFind {
    1.10      KeyIntMap& pointmap;
    1.11      struct VectorElementType {
    1.12 @@ -34,7 +34,7 @@
    1.13      } 
    1.14      
    1.15      //Give a component of one point to the structure
    1.16 -    int addPoint(KeyType u){
    1.17 +    int addPoint(Key u){
    1.18        int _index = container.size();
    1.19        VectorElementType buf(_index,1);
    1.20        container.push_back(buf);
    1.21 @@ -43,7 +43,7 @@
    1.22  
    1.23      
    1.24      //Finds the big boss of u
    1.25 -    int find(KeyType u){
    1.26 +    int find(Key u){
    1.27        if (pointmap.get(u)==-1){
    1.28  	int whoami = addPoint(u);
    1.29  	pointmap.set(u, whoami);
    1.30 @@ -61,7 +61,7 @@
    1.31      }
    1.32  
    1.33      //Finds u and v in the structures and merges the comopnents, if not equal
    1.34 -    bool findAndMerge(KeyType u,KeyType v){
    1.35 +    bool findAndMerge(Key u,Key v){
    1.36        int bu = find(u);
    1.37        int bv = find(v);
    1.38        if (bu != bv){