Changes in stable/2.9/Cbc/src/CbcHeuristic.cpp [2143:2123]
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

stable/2.9/Cbc/src/CbcHeuristic.cpp
r2143 r2123 31 31 #include "CglProbing.hpp" 32 32 #include "OsiAuxInfo.hpp" 33 #include "OsiRowCutDebugger.hpp"34 33 #include "OsiPresolve.hpp" 35 34 #include "CbcBranchActual.hpp" … … 940 939 solver>messageHandler()>logLevel(0)!=1000) 941 940 process.passInMessageHandler(solver>messageHandler()); 942 #ifdef CGL_DEBUG943 /*944 We're debugging. (specialOptions 1)945 */946 if ((model_>specialOptions()&1) != 0) {947 const OsiRowCutDebugger *debugger = solver>getRowCutDebugger() ;948 if (debugger) {949 process.setApplicationData(const_cast<double *>(debugger>optimalSolution()));950 }951 }952 #endif953 941 solver2 = process.preProcessNonDefault(*solver, false, 954 942 numberPasses); … … 984 972 << CoinMessageEol; 985 973 } 986 #ifdef CGL_DEBUG987 if ((model_>specialOptions()&1) != 0) {988 const OsiRowCutDebugger *debugger = solver2>getRowCutDebugger() ;989 if (debugger) {990 printf("On optimal path after preprocessing\n");991 }992 }993 #endif994 974 if (returnCode == 1) { 995 975 solver2>resolve(); … … 1066 1046 // going for full search and copy across more stuff 1067 1047 model.gutsOfCopy(*model_, 2); 1068 #ifdef CGL_DEBUG1069 if ((model_>specialOptions()&1) != 0) {1070 const OsiRowCutDebugger *debugger = model.solver()>getRowCutDebugger() ;1071 if (debugger) {1072 printf("On optimal path BB\n");1073 }1074 }1075 #endif1076 1048 assert (!model_>heuristicModel()); 1077 1049 model_>setHeuristicModel(&model); … … 1237 1209 } 1238 1210 //printf("sol %x\n",inputSolution_); 1239 #ifdef CGL_DEBUG1240 if ((model_>specialOptions()&1) != 0) {1241 const OsiRowCutDebugger *debugger = model.solver()>getRowCutDebugger() ;1242 if (debugger) {1243 printf("On optimal path CC\n");1244 }1245 }1246 #endif1247 1211 if (inputSolution_) { 1248 1212 // translate and add a serendipity heuristic … … 1365 1329 if ((model_>moreSpecialOptions()&4194304)!=0) 1366 1330 model.zapGlobalCuts(); 1367 #endif1368 #ifdef CGL_DEBUG1369 if ((model_>specialOptions()&1) != 0) {1370 const OsiRowCutDebugger *debugger = model.solver()>getRowCutDebugger() ;1371 if (debugger) {1372 printf("On optimal path DD\n");1373 }1374 }1375 1331 #endif 1376 1332 model.branchAndBound();
Note: See TracChangeset
for help on using the changeset viewer.