Changeset 1393 for branches/sandbox/Cbc/src/CbcHeuristicFPump.cpp
 Timestamp:
 Dec 10, 2009 7:29:38 PM (10 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

branches/sandbox/Cbc/src/CbcHeuristicFPump.cpp
r1364 r1393 588 588 // Tweak rhs and save 589 589 useRhs = rhs; 590 #if 0590 #ifdef JJF_ZERO 591 591 double tempValue = 60.0 * useRhs; 592 592 if (fabs(tempValue  floor(tempValue + 0.5)) < 1.0e7 && rhs != fakeCutoff_) { … … 1232 1232 } 1233 1233 if (newNumberInfeas && newNumberInfeas < 15) { 1234 #if 01234 #ifdef JJF_ZERO 1235 1235 roundingObjective = solutionValue; 1236 1236 OsiSolverInterface * saveSolver = model_>swapSolver(solver); … … 1881 1881 if (value < newSolutionValue) { 1882 1882 //newSolver>writeMps("query","mps"); 1883 #if 01883 #ifdef JJF_ZERO 1884 1884 { 1885 1885 double saveOffset; … … 2187 2187 } 2188 2188 int numberColumns = solver>getNumCols(); 2189 #if 02189 #ifdef JJF_ZERO 2190 2190 // Do set covering variables 2191 2191 const CoinPackedMatrix * matrixByRow = solver>getMatrixByRow(); … … 2335 2335 double round = floor(value + primalTolerance); 2336 2336 if (value  round > downValue) round += 1.; 2337 #if 12337 #ifndef JJF_ONE 2338 2338 if (round < integerTolerance && cost[iColumn] < 1. + integerTolerance) flip_down++; 2339 2339 if (round > 1.  integerTolerance && cost[iColumn] > 1.  integerTolerance) flip_up++; … … 2410 2410 } 2411 2411 } 2412 #if 02412 #ifdef JJF_ZERO 2413 2413 if (largestInfeasibility > primalTolerance && numberBadRows*10 < numberRows) { 2414 2414 // Can we improve by flipping … … 2542 2542 } 2543 2543 // Now flip some integers? 2544 #if 02544 #ifdef JJF_ZERO 2545 2545 for (i = 0; i < numberIntegers; i++) { 2546 2546 int iColumn = integerVariable[i];
Note: See TracChangeset
for help on using the changeset viewer.