Changeset 397:61fbd77f0f44 in lemon

Timestamp:

11/21/08 11:41:36 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Don't assume that the default maps are reference maps (in Elevator)

File:

• lemon/elevator.h (modified) (14 diffs)

lemon/elevator.h

@@ -75 +75 @@
     void copy(Item i, Vit p)
     {
-      _where[*p=i]=p;
+      _where.set(*p=i,p);
     }
     void copy(Vit s, Vit p)
@@ -83 +83 @@
           Item i=*s;
           *p=i;
-          _where[i]=p;
+          _where.set(i,p);
         }
     }
@@ -90 +90 @@
       Item ti=*i;
       Vit ct = _where[ti];
-      _where[ti]=_where[*i=*j];
-      _where[*j]=ct;
+      _where.set(ti,_where[*i=*j]);
+      _where.set(*j,ct);
       *j=ti;
     }
@@ -228 +228 @@
     void liftHighestActive()
     {
-      ++_level[*_last_active[_highest_active]];
+      Item it = *_last_active[_highest_active];
+      _level.set(it,_level[it]+1);
       swap(_last_active[_highest_active]--,_last_active[_highest_active+1]);
       --_first[++_highest_active];
@@ -251 +252 @@
         }
       copy(li,_first[new_level]);
-      _level[li]=new_level;
+      _level.set(li,new_level);
       _highest_active=new_level;
     }
@@ -275 +276 @@
       copy(li,_first[_max_level]);
       --_last_active[_max_level];
-      _level[li]=_max_level;
+      _level.set(li,_max_level);
 
       while(_highest_active>=0 &&
@@ -306 +307 @@
     Item liftActiveOn(int level)
     {
-      ++_level[*_last_active[level]];
+      Item it =*_last_active[level];
+      _level.set(it,_level[it]+1);
       swap(_last_active[level]--, --_first[level+1]);
       if (level+1>_highest_active) ++_highest_active;
@@ -326 +328 @@
         }
       copy(ai,_first[new_level]);
-      _level[ai]=new_level;
+      _level.set(ai,new_level);
       if (new_level>_highest_active) _highest_active=new_level;
     }
@@ -346 +348 @@
       copy(ai,_first[_max_level]);
       --_last_active[_max_level];
-      _level[ai]=_max_level;
+      _level.set(ai,_max_level);
 
       if (_highest_active==level) {
@@ -377 +379 @@
         }
       copy(i,_first[new_level]);
-      _level[i]=new_level;
+      _level.set(i,new_level);
       if(new_level>_highest_active) _highest_active=new_level;
     }
@@ -388 +390 @@
     ///\pre The item is on the top level.
     void dirtyTopButOne(Item i) {
-      _level[i] = _max_level - 1;
+      _level.set(i,_max_level - 1);
     }
 
@@ -400 +402 @@
       const Vit tl=_first[_max_level];
       for(Vit i=f;i!=tl;++i)
-        _level[*i]=_max_level;
+        _level.set(*i,_max_level);
       for(int i=l;i<=_max_level;i++)
         {
@@ -441 +443 @@
         {
           *n=i;
-          _where[i]=n;
-          _level[i]=_max_level;
+          _where.set(i,n);
+          _level.set(i,_max_level);
           ++n;
         }
@@ -451 +453 @@
     void initAddItem(Item i)
     {
-     swap(_where[i],_init_num);
-      _level[i]=_init_lev;
+      swap(_where[i],_init_num);
+      _level.set(i,_init_lev);
       ++_init_num;
     }