Changeset - r462:1cc2818c03c0
« 460:81d40f
« 458:bb022b
499:227f36 »
gravatar
deba@inf.elte.hu
deba@inf.elte.hu
Merge bugfix #197
0 1 0
merge 1.0
0 files changed with 4 insertions and 7 deletions:
lemon/unionfind.h
4
7
↑ Collapse diff ↑
lemon/unionfind.h
Show white space 4 line context
... ... 
@@ -1178,5 +1178,6 @@
1178 1178 
            if (nodes[nodes[jd].next].size < cmax) {
1179 1179 
              pushLeft(nodes[jd].next, nodes[jd].left);
1180 
              if (nodes[jd].item == nodes[pd].item) {
1180 
              if (less(jd, nodes[jd].next) ||
1181 
                  nodes[jd].item == nodes[pd].item) {
1181 1182 
                nodes[nodes[jd].next].prio = nodes[jd].prio;
1182 1183 
                nodes[nodes[jd].next].item = nodes[jd].item;
... ... 
@@ -1221,5 +1222,6 @@
1221 1222 
            if (nodes[nodes[jd].prev].size < cmax) {
1222 1223 
              pushRight(nodes[jd].prev, nodes[jd].right);
1223 
              if (nodes[jd].item == nodes[pd].item) {
1224 
              if (less(jd, nodes[jd].prev) ||
1225 
                  nodes[jd].item == nodes[pd].item) {
1224 1226 
                nodes[nodes[jd].prev].prio = nodes[jd].prio;
1225 1227 
                nodes[nodes[jd].prev].item = nodes[jd].item;
... ... 
@@ -1254,9 +1256,4 @@
1254 1256 
    }
1255 1257 

			




	1256
	
	
		
    bool equal(int id, int jd) const {


			




	1257
	
	
		
      return !less(id, jd) && !less(jd, id);


			




	1258
	
	
		
    }


			




	1259
	
	
		

			




	1260
	
	
		

			




	1261
	1258
	
		
  public:


			




	1262
	1259
	
		

			




        

    






    
    



    


    

     
    
0 comments (0 inline)