Changeset 593:7ac52d6a268e in lemon1.2 for test/max_matching_test.cc
 Timestamp:
 04/17/09 09:54:14 (13 years ago)
 Branch:
 default
 Phase:
 public
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

test/max_matching_test.cc
r590 r593 139 139 const_mat_test.matching(e); 140 140 const_mat_test.matching(n); 141 const MaxMatching<Graph>::MatchingMap& mmap = 142 const_mat_test.matchingMap(); 143 e = mmap[n]; 141 144 const_mat_test.mate(n); 142 145 143 146 MaxMatching<Graph>::Status stat = 144 const_mat_test.decomposition(n); 147 const_mat_test.status(n); 148 const MaxMatching<Graph>::StatusMap& smap = 149 const_mat_test.statusMap(); 150 stat = smap[n]; 145 151 const_mat_test.barrier(n); 146 147 ignore_unused_variable_warning(stat);148 152 } 149 153 … … 168 172 mat_test.run(); 169 173 170 const_mat_test.matching Value();174 const_mat_test.matchingWeight(); 171 175 const_mat_test.matchingSize(); 172 176 const_mat_test.matching(e); 173 177 const_mat_test.matching(n); 178 const MaxWeightedMatching<Graph>::MatchingMap& mmap = 179 const_mat_test.matchingMap(); 180 e = mmap[n]; 174 181 const_mat_test.mate(n); 175 182 … … 202 209 mat_test.run(); 203 210 204 const_mat_test.matching Value();211 const_mat_test.matchingWeight(); 205 212 const_mat_test.matching(e); 206 213 const_mat_test.matching(n); 214 const MaxWeightedPerfectMatching<Graph>::MatchingMap& mmap = 215 const_mat_test.matchingMap(); 216 e = mmap[n]; 207 217 const_mat_test.mate(n); 208 218 … … 225 235 226 236 for (NodeIt n(graph); n != INVALID; ++n) { 227 check(mm. decomposition(n) == MaxMatching<SmartGraph>::EVEN 237 check(mm.status(n) == MaxMatching<SmartGraph>::EVEN  228 238 mm.matching(n) != INVALID, "Wrong GallaiEdmonds decomposition"); 229 if (mm. decomposition(n) == MaxMatching<SmartGraph>::ODD) {239 if (mm.status(n) == MaxMatching<SmartGraph>::ODD) { 230 240 ++barrier_num; 231 241 } else { … … 240 250 ++num; 241 251 } 242 check(mm. decomposition(graph.u(e)) != MaxMatching<SmartGraph>::EVEN 243 mm. decomposition(graph.v(e)) != MaxMatching<SmartGraph>::MATCHED,252 check(mm.status(graph.u(e)) != MaxMatching<SmartGraph>::EVEN  253 mm.status(graph.v(e)) != MaxMatching<SmartGraph>::MATCHED, 244 254 "Wrong GallaiEdmonds decomposition"); 245 255 246 check(mm. decomposition(graph.v(e)) != MaxMatching<SmartGraph>::EVEN 247 mm. decomposition(graph.u(e)) != MaxMatching<SmartGraph>::MATCHED,256 check(mm.status(graph.v(e)) != MaxMatching<SmartGraph>::EVEN  257 mm.status(graph.u(e)) != MaxMatching<SmartGraph>::MATCHED, 248 258 "Wrong GallaiEdmonds decomposition"); 249 259 250 if (mm. decomposition(graph.u(e)) != MaxMatching<SmartGraph>::ODD &&251 mm. decomposition(graph.v(e)) != MaxMatching<SmartGraph>::ODD) {260 if (mm.status(graph.u(e)) != MaxMatching<SmartGraph>::ODD && 261 mm.status(graph.v(e)) != MaxMatching<SmartGraph>::ODD) { 252 262 comp.join(graph.u(e), graph.v(e)); 253 263 } … … 257 267 int odd_comp_num = 0; 258 268 for (NodeIt n(graph); n != INVALID; ++n) { 259 if (mm. decomposition(n) != MaxMatching<SmartGraph>::ODD) {269 if (mm.status(n) != MaxMatching<SmartGraph>::ODD) { 260 270 int root = comp.find(n); 261 271 if (comp_root.find(root) == comp_root.end()) {
Note: See TracChangeset
for help on using the changeset viewer.