Changeset 2004:b8f10207e3d6 in lemon-0.x

Timestamp:

03/10/06 19:17:37 (17 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

UnionFindEnum?: one remaining bug; removing commented out code

File:

• lemon/unionfind.h (modified) (12 diffs)

lemon/unionfind.h

@@ -301 +301 @@
       IIter clit = _find(m[comp]);
       ItemList &c = *clit->my_class;
-      c.push_back(ItemType(a,0));
+      c.push_back(ItemType(a,CIter()));
       IIter ai = c.end();
       --ai;
@@ -348 +348 @@
 
         classes.erase(cb->my_class);
-        // ehem: cb->my_class = 0;
       }
       else {
@@ -359 +358 @@
 
         classes.erase(ca->my_class);
-        // ehem: ca->my_class = 0;
       }
 
@@ -421 +419 @@
 
       ia->my_class = la->my_class;
-      // ehem: la->my_class = 0;
 
       ia->size = la->size;
@@ -479 +476 @@
 
       ai->parent = clit;
-      // ehem: ai->my_class = 0;
       ++clit->size;
 
@@ -497 +493 @@
 
       IIter ma = m[a];
-      // ehem: if (ma == 0) return;
 
       IIter la = _find(ma);
@@ -503 +498 @@
         if (ma -> size == 1){
           classes.erase(ma->my_class);
-          // ehem: m.set(a,0);
           return;
         }
@@ -517 +511 @@
       la->size--;
       la->my_class->erase(ma);
-      // ehem: m.set(a,0);
     }
 
@@ -530 +523 @@
     void eraseClass(const T &a) {
       IIter ma = m[a];
-      // ehem: if (ma == 0) return;
-// #     ifdef DEBUG
-//       CIter c = _find(ma)->my_class;
-//       for (IIter i=c->begin(); i!=c->end(); ++i)
-//      m.set(i->me, 0);
-// #     endif
       classes.erase(_find(ma)->my_class);
     }
@@ -582 +569 @@
       // obsoleted:
       bool valid() const { return l!=0 && i!=l->end(); }
-    private:
-      //void first(const ClassList &l) { i = l.begin(); validate(l); }
-//       void next(const ClassList &l) {
-//      ++i; 
-//      validate(l);
-//       }
-//       void validate(const ClassList &l) {
-//      if ( i == l.end() ) 
-//        i = 0;
-//       }
     };
 
@@ -662 +639 @@
       
       operator const T& () const { return i->me; }
-      bool operator == (ItemIt it) const {
+      bool operator == (ItemIt const &it) const {
         return (l==it.l && i==it.i) || (!valid() && !it.valid());
       }
-      bool operator != (ItemIt it) const {
+      bool operator != (ItemIt const &it) const {
         return !(*this == it);
       }
-      bool operator < (ItemIt it) const {
+      bool operator < (ItemIt const &it) const {
         return (i < it.i);
       }
@@ -686 +663 @@
       // obsoleted:
       bool valid() const { return l!=0 && i!=l->end(); }
-    private:
-//       void first(const ItemList &il) { l=&il; i = l->begin(); validate(); }
-//       void next() {
-//      ++i; 
-//      validate();
-//       }
-//       void validate() {
-//      if ( i == l->end() ) 
-//        i = 0;
-//       }
     };