Changeset 1053 for trunk/Cbc/src/CbcCutGenerator.cpp
 Timestamp:
 Sep 4, 2008 4:48:22 PM (12 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Cbc/src/CbcCutGenerator.cpp
r1016 r1053 168 168 CbcCutGenerator::generateCuts( OsiCuts & cs , int fullScan, OsiSolverInterface * solver, CbcNode * node) 169 169 { 170 #define PROBE1 0170 #define PROBE1 1 171 171 #define PROBE2 0 172 #define PROBE3 0172 #define PROBE3 1 173 173 int depth; 174 174 if (node) … … 256 256 #if PROBE3 257 257 if ((numberTimes_==200(numberTimes_>200&&(numberTimes_%2000)==0)) 258 &&!model_>parentModel() ) {258 &&!model_>parentModel()&&info.formulation_rows>500) { 259 259 // in tree, maxStack, maxProbe 260 260 int test[]= { … … 272 272 int saveStack = generator>getMaxLook(); 273 273 int saveNumber = generator>getMaxProbe(); 274 #undef CLP_INVESTIGATE 274 275 #ifdef CLP_INVESTIGATE 275 276 int kr1=0; … … 315 316 #ifdef CLP_INVESTIGATE 316 317 printf("RRSwitching off number %d > %d, stack %d > %d\n", 317 saveNumber,saveNumber,saveStack, 1);318 saveNumber,saveNumber,saveStack,0); 318 319 #endif 319 320 } … … 512 513 const double * solution = solver>getColSolution(); 513 514 bool feasible=true; 515 double primalTolerance = 1.0e7; 514 516 for (k = numberRowCutsAfter1;k>=numberRowCutsBefore;k) { 515 517 const OsiRowCut * thisCut = cs.rowCutPtr(k) ; … … 529 531 sum += value*solution[column[i]]; 530 532 } 531 if (sum>thisCut>ub() ) {533 if (sum>thisCut>ub()+primalTolerance) { 532 534 sum= sumthisCut>ub(); 533 } else if (sum<thisCut>lb() ) {535 } else if (sum<thisCut>lb()primalTolerance) { 534 536 sum= thisCut>lb()sum; 535 537 } else { … … 608 610 // Now see which ones are too similar 609 611 int nParallel=0; 612 double testValue = (depth>1) ? 0.99 : 0.999999; 610 613 for (k = 0;k<nCuts;k++) { 611 614 int j=which[k]; … … 626 629 } 627 630 int kkk = CoinMin(nCuts,k+5); 628 double testValue = (depth>1) ? 0.9 : 0.99999;629 631 for (int kk=k+1;kk<kkk;kk++) { 630 632 int jj=which[kk];
Note: See TracChangeset
for help on using the changeset viewer.