Changeset - r382:61fbd77f0f44
« 381:b04e43
383:a8a22a »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Don't assume that the default maps are reference maps (in Elevator)
0 1 0
default
1 file changed with 19 insertions and 17 deletions:
lemon/elevator.h
19
17
↑ Collapse diff ↑
lemon/elevator.h
Show white space 6 line context
... ... 
@@ -76,3 +76,3 @@
76 76 
    {
77 
      _where[*p=i]=p;
77 
      _where.set(*p=i,p);
78 78 
    }
... ... 
@@ -84,3 +84,3 @@
84 84 
          *p=i;
85 
          _where[i]=p;
85 
          _where.set(i,p);
86 86 
        }
... ... 
@@ -91,4 +91,4 @@
91 91 
      Vit ct = _where[ti];
92 
      _where[ti]=_where[*i=*j];
93 
      _where[*j]=ct;
92 
      _where.set(ti,_where[*i=*j]);
93 
      _where.set(*j,ct);
94 94 
      *j=ti;
... ... 
@@ -229,3 +229,4 @@
229 229 
    {
230 
      ++_level[*_last_active[_highest_active]];
230 
      Item it = *_last_active[_highest_active];
231 
      _level.set(it,_level[it]+1);
231 232 
      swap(_last_active[_highest_active]--,_last_active[_highest_active+1]);
... ... 
@@ -252,3 +253,3 @@
252 253 
      copy(li,_first[new_level]);
253 
      _level[li]=new_level;
254 
      _level.set(li,new_level);
254 255 
      _highest_active=new_level;
... ... 
@@ -276,3 +277,3 @@
276 277 
      --_last_active[_max_level];
277 
      _level[li]=_max_level;
278 
      _level.set(li,_max_level);
278 279 

			




	...
	...
	
		
@@ -307,3 +308,4 @@


			




	307
	308
	
		
    {


			




	308
	
	
		
      ++_level[*_last_active[level]];


			




	
	309
	
		
      Item it =*_last_active[level];


			




	
	310
	
		
      _level.set(it,_level[it]+1);


			




	309
	311
	
		
      swap(_last_active[level]--, --_first[level+1]);


			




	...
	...
	
		
@@ -327,3 +329,3 @@


			




	327
	329
	
		
      copy(ai,_first[new_level]);


			




	328
	
	
		
      _level[ai]=new_level;


			




	
	330
	
		
      _level.set(ai,new_level);


			




	329
	331
	
		
      if (new_level>_highest_active) _highest_active=new_level;


			




	...
	...
	
		
@@ -347,3 +349,3 @@


			




	347
	349
	
		
      --_last_active[_max_level];


			




	348
	
	
		
      _level[ai]=_max_level;


			




	
	350
	
		
      _level.set(ai,_max_level);


			




	349
	351
	
		

			




	...
	...
	
		
@@ -378,3 +380,3 @@


			




	378
	380
	
		
      copy(i,_first[new_level]);


			




	379
	
	
		
      _level[i]=new_level;


			




	
	381
	
		
      _level.set(i,new_level);


			




	380
	382
	
		
      if(new_level>_highest_active) _highest_active=new_level;


			




	...
	...
	
		
@@ -389,3 +391,3 @@


			




	389
	391
	
		
    void dirtyTopButOne(Item i) {


			




	390
	
	
		
      _level[i] = _max_level - 1;


			




	
	392
	
		
      _level.set(i,_max_level - 1);


			




	391
	393
	
		
    }


			




	...
	...
	
		
@@ -401,3 +403,3 @@


			




	401
	403
	
		
      for(Vit i=f;i!=tl;++i)


			




	402
	
	
		
        _level[*i]=_max_level;


			




	
	404
	
		
        _level.set(*i,_max_level);


			




	403
	405
	
		
      for(int i=l;i<=_max_level;i++)


			




	...
	...
	
		
@@ -442,4 +444,4 @@


			




	442
	444
	
		
          *n=i;


			




	443
	
	
		
          _where[i]=n;


			




	444
	
	
		
          _level[i]=_max_level;


			




	
	445
	
		
          _where.set(i,n);


			




	
	446
	
		
          _level.set(i,_max_level);


			




	445
	447
	
		
          ++n;


			




	...
	...
	
		
@@ -452,4 +454,4 @@


			




	452
	454
	
		
    {


			




	453
	
	
		
     swap(_where[i],_init_num);


			




	454
	
	
		
      _level[i]=_init_lev;


			




	
	455
	
		
      swap(_where[i],_init_num);


			




	
	456
	
		
      _level.set(i,_init_lev);


			




	455
	457
	
		
      ++_init_num;


			




        

    






    
    



    


    

     
    
0 comments (0 inline)