Changeset - r644:2ca0cdb5f366
« 643:293551
646:f63e87 »
gravatar
deba@inf.elte.hu
deba@inf.elte.hu
Fix in HaoOrlin (#264)
0 2 0
default
2 files changed with 14 insertions and 24 deletions:
lemon/hao_orlin.h
2
test/hao_orlin_test.cc
12
24
↑ Collapse diff ↑
lemon/hao_orlin.h
Show white space 6 line context
... ... 
@@ -228,2 +228,3 @@
228 228 
        (*_excess)[n] = 0;
229 
        (*_source_set)[n] = false;
229 230 
      }
... ... 
@@ -527,2 +528,3 @@
527 528 
        (*_excess)[n] = 0;
529 
        (*_source_set)[n] = false;
528 530 
      }
test/hao_orlin_test.cc
Ignore white space 6 line context
... ... 
@@ -113,6 +113,4 @@
113 113
114 
    // BUG: The cut value should be positive
115 
    check(ho.minCutValue() == 0, "Wrong cut value");
116 
    // BUG: It should work
117 
    //check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value");
114 
    check(ho.minCutValue() == 1, "Wrong cut value");
115 
    check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value");
118 116 
  }
... ... 
@@ -122,7 +120,5 @@
122 120 
    ho.minCutMap(cut);
123
124 
    // BUG: The cut value should be positive
125 
    check(ho.minCutValue() == 0, "Wrong cut value");
126 
    // BUG: It should work
127 
    //check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value");
121 

			




	
	122
	
		
    check(ho.minCutValue() == 1, "Wrong cut value");


			




	
	123
	
		
    check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value");


			




	128
	124
	
		
  }


			




	...
	...
	
		
@@ -133,6 +129,4 @@


			




	133
	129
	
		
    


			




	134
	
	
		
    // BUG: The cut value should be positive


			




	135
	
	
		
    check(ho.minCutValue() == 0, "Wrong cut value");


			




	136
	
	
		
    // BUG: It should work


			




	137
	
	
		
    //check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value");


			




	
	130
	
		
    check(ho.minCutValue() == 1, "Wrong cut value");


			




	
	131
	
		
    check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value");


			




	138
	132
	
		
  }


			




	...
	...
	
		
@@ -147,6 +141,4 @@


			




	147
	141
	
		
    


			




	148
	
	
		
    // BUG: The cut value should be 2


			




	149
	
	
		
    check(ho.minCutValue() == 1, "Wrong cut value");


			




	150
	
	
		
    // BUG: It should work


			




	151
	
	
		
    //check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value");


			




	
	142
	
		
    check(ho.minCutValue() == 2, "Wrong cut value");


			




	
	143
	
		
    check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value");


			




	152
	144
	
		
  }


			




	...
	...
	
		
@@ -157,6 +149,4 @@


			




	157
	149
	
		
    


			




	158
	
	
		
    // TODO: Check this cut value


			




	159
	
	
		
    check(ho.minCutValue() == 4, "Wrong cut value");


			




	160
	
	
		
    // BUG: It should work


			




	161
	
	
		
    //check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value");


			




	
	150
	
		
    check(ho.minCutValue() == 5, "Wrong cut value");


			




	
	151
	
		
    check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value");


			




	162
	152
	
		
  }


			




	...
	...
	
		
@@ -167,6 +157,4 @@


			




	167
	157
	
		
    


			




	168
	
	
		
    // TODO: Check this cut value


			




	169
	158
	
		
    check(ho.minCutValue() == 5, "Wrong cut value");


			




	170
	
	
		
    // BUG: It should work


			




	171
	
	
		
    //check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value");


			




	
	159
	
		
    check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value");


			




	172
	160
	
		
  }


			




        

    






    
    



    


    

     
    
0 comments (0 inline)