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

 1 edited
Legend:
 Unmodified
 Added
 Removed

branches/sandbox/Cbc/src/CbcLinked.cpp
r1286 r1393 876 876 gutsOfDestructor(true); 877 877 } 878 #if 0878 #ifdef JJF_ZERO 879 879 /* returns 880 880 sequence of nonlinear or … … 1681 1681 } 1682 1682 } 1683 #if 01683 #ifdef JJF_ZERO 1684 1684 // possibly do bounds 1685 1685 for (int iColumn = 0; iColumn < firstLambda; iColumn++) { … … 1834 1834 if (obj) { 1835 1835 if (obj>xMeshSize() < 1.0 && obj>yMeshSize() < 1.0) { 1836 #if 01836 #ifdef JJF_ZERO 1837 1837 numberContinuous++; 1838 1838 int xColumn = obj>xColumn(); … … 2326 2326 memset(r, 0, numberColumns*sizeof(double)); 2327 2327 } 2328 #if 02328 #ifdef JJF_ZERO 2329 2329 for (jNon = 0; jNon < numberNonLinearColumns; jNon++) { 2330 2330 iColumn = listNonLinearColumn[jNon]; … … 2581 2581 cbcModel>cutGenerator(6)>setTiming(true); 2582 2582 // For now  switch off most heuristics (because CglPreProcess is bad with QP) 2583 #if 12583 #ifndef JJF_ONE 2584 2584 CbcHeuristicFPump heuristicFPump(*cbcModel); 2585 2585 heuristicFPump.setWhen(13); … … 3621 3621 if (zeroObjective) { 3622 3622 cbcModel>setMaximumSolutions(1); // just getting a solution 3623 #if 03623 #ifdef JJF_ZERO 3624 3624 OsiClpSolverInterface * osiclpModel = dynamic_cast< OsiClpSolverInterface*> (cbcModel>solver()); 3625 3625 ClpSimplex * clpModel = osiclpModel>getModelPtr(); … … 3861 3861 } 3862 3862 } 3863 #if 03863 #ifdef JJF_ZERO 3864 3864 // Add an element modifier 3865 3865 void … … 4419 4419 int iColumn = members_[j]; 4420 4420 int i; 4421 #if 04421 #ifdef JJF_ZERO 4422 4422 for (i = 0; i < numberColumns; i++) { 4423 4423 if (originalColumns[i] == iColumn) … … 5276 5276 yB[0] = info>lower_[yColumn_]; 5277 5277 yB[1] = info>upper_[yColumn_]; 5278 #if 05278 #ifdef JJF_ZERO 5279 5279 if (info>lower_[1] <= 43.0 && info>upper_[1] >= 43.0) { 5280 5280 if (info>lower_[4] <= 49.0 && info>upper_[4] >= 49.0) { … … 5454 5454 assert (xyTrue  1.0e5 < xB[0]*y + yB[1]*x  xB[0]*yB[1]); 5455 5455 // see if all convexification constraints OK with lambda version 5456 #if 15456 #ifndef JJF_ONE 5457 5457 assert (xyLambda + 1.0e5 > xB[0]*y + yB[0]*x  xB[0]*yB[0]); 5458 5458 assert (xyLambda + 1.0e5 > xB[1]*y + yB[1]*x  xB[1]*yB[1]); … … 5619 5619 if (fabs(xyLambda  xyTrue) < xySatisfied_  (xB[0] == xB[1] && yB[0] == yB[1])) { 5620 5620 // satisfied 5621 #if 05621 #ifdef JJF_ZERO 5622 5622 printf("all satisfied true %g lambda %g\n", 5623 5623 xyTrue, xyLambda); … … 5974 5974 if (yRow_ < 0) 5975 5975 yLambda = xLambda; 5976 #if 05976 #ifdef JJF_ZERO 5977 5977 if (fabs(x  xLambda) > 1.0e4  5978 5978 fabs(y  yLambda) > 1.0e4) … … 6082 6082 { 6083 6083 int i; 6084 #if 06084 #ifdef JJF_ZERO 6085 6085 for (i = 0; i < numberColumns; i++) { 6086 6086 if (originalColumns[i] == firstLambda_) … … 6200 6200 iColumn, oldLower, oldUpper); 6201 6201 #endif 6202 #if 06202 #ifdef JJF_ZERO 6203 6203 // always free up lambda 6204 6204 for (int i = firstLambda_; i < firstLambda_ + 4; i++) { … … 7223 7223 void checkQP(ClpSimplex * /*model*/) 7224 7224 { 7225 #if 07225 #ifdef JJF_ZERO 7226 7226 printf("Checking quadratic model %x\n", model); 7227 7227 if (model) { … … 7711 7711 int /*mode*/) 7712 7712 { 7713 #if 17713 #ifndef JJF_ONE 7714 7714 //#ifdef COIN_HAS_ASL 7715 7715 // matrix etc will be changed
Note: See TracChangeset
for help on using the changeset viewer.