Changeset 1799
 Timestamp:
 Oct 30, 2012 1:07:45 PM (8 years ago)
 Location:
 trunk/Cbc/src
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Cbc/src/CbcCompareDefault.cpp
r1573 r1799 172 172 } else { 173 173 assert (depthX != depthY) ; 174 return depthX >depthY;174 return depthX < depthY; 175 175 } 176 176 } 
trunk/Cbc/src/CbcSOS.cpp
r1718 r1799 298 298 double movement = info>usefulRegion_[iRow]; 299 299 // not this time info>usefulRegion_[iRow]=0.0; 300 if (lower[iRow] < 1.0e20) 301 assert (pi[iRow] <= 1.0e3); 302 if (upper[iRow] > 1.0e20) 303 assert (pi[iRow] >= 1.0e3); 300 #if 0 301 if (lower[iRow] < 1.0e20) { 302 if (pi[iRow] > 1.0e3) { 303 printf("Bad pi on row %d of %g\n",iRow,pi[iRow]); 304 } 305 } 306 if (upper[iRow] >1.0e20) { 307 if (pi[iRow] < 1.0e3) { 308 printf("Bad pi on row %d of %g\n",iRow,pi[iRow]); 309 } 310 } 311 #endif 304 312 double valueP = pi[iRow] * direction; 305 313 // if move makes infeasible then make at least default … … 358 366 double movement = info>usefulRegion_[iRow]; 359 367 info>usefulRegion_[iRow] = 0.0; 360 if (lower[iRow] < 1.0e20) 361 assert (pi[iRow] <= 1.0e3); 362 if (upper[iRow] > 1.0e20) 363 assert (pi[iRow] >= 1.0e3); 368 #if 0 369 if (lower[iRow] < 1.0e20) { 370 if (pi[iRow] > 1.0e3) { 371 printf("Bad pi on row %d of %g\n",iRow,pi[iRow]); 372 } 373 } 374 if (upper[iRow] >1.0e20) { 375 if (pi[iRow] < 1.0e3) { 376 printf("Bad pi on row %d of %g\n",iRow,pi[iRow]); 377 } 378 } 379 #endif 364 380 double valueP = pi[iRow] * direction; 365 381 // if move makes infeasible then make at least default
Note: See TracChangeset
for help on using the changeset viewer.