Changeset 2146 for trunk/Cbc/src/CbcHeuristic.cpp

Timestamp:

Feb 27, 2015 11:24:47 AM (4 years ago)

Author:

forrest

Message:

improve solution checking

File:

• trunk/Cbc/src/CbcHeuristic.cpp (modified) (6 diffs)

trunk/Cbc/src/CbcHeuristic.cpp

@@ -31 +31 @@
 #include "CglProbing.hpp"
 #include "OsiAuxInfo.hpp"
+#include "OsiRowCutDebugger.hpp"
 #include "OsiPresolve.hpp"
 #include "CbcBranchActual.hpp"
@@ -939 +940 @@
             solver->messageHandler()->logLevel(0)!=-1000)
           process.passInMessageHandler(solver->messageHandler());
+#ifdef CGL_DEBUG
+        /*
+          We're debugging. (specialOptions 1)
+        */
+        if ((model_->specialOptions()&1) != 0) {
+          const OsiRowCutDebugger *debugger = solver->getRowCutDebugger() ;
+          if (debugger) {
+            process.setApplicationData(const_cast<double *>(debugger->optimalSolution()));
+          }
+        }
+#endif
         solver2 = process.preProcessNonDefault(*solver, false,
                                                numberPasses);
@@ -972 +984 @@
                 << CoinMessageEol;
             }
+#ifdef CGL_DEBUG
+            if ((model_->specialOptions()&1) != 0) {
+              const OsiRowCutDebugger *debugger = solver2->getRowCutDebugger() ;
+              if (debugger) {
+                printf("On optimal path after preprocessing\n");
+              }
+            }
+#endif
             if (returnCode == 1) {
                 solver2->resolve();
@@ -1046 +1066 @@
                     // going for full search and copy across more stuff
                     model.gutsOfCopy(*model_, 2);
+#ifdef CGL_DEBUG
+                    if ((model_->specialOptions()&1) != 0) {
+                      const OsiRowCutDebugger *debugger = model.solver()->getRowCutDebugger() ;
+                      if (debugger) {
+                        printf("On optimal path BB\n");
+                      }
+                    }
+#endif
                     assert (!model_->heuristicModel());
                     model_->setHeuristicModel(&model);
@@ -1209 +1237 @@
                 }
                 //printf("sol %x\n",inputSolution_);
+#ifdef CGL_DEBUG
+                if ((model_->specialOptions()&1) != 0) {
+                  const OsiRowCutDebugger *debugger = model.solver()->getRowCutDebugger() ;
+                  if (debugger) {
+                    printf("On optimal path CC\n");
+                  }
+                }
+#endif
                 if (inputSolution_) {
                     // translate and add a serendipity heuristic
@@ -1329 +1365 @@
                     if ((model_->moreSpecialOptions()&4194304)!=0)
                       model.zapGlobalCuts();
+#endif
+#ifdef CGL_DEBUG
+                    if ((model_->specialOptions()&1) != 0) {
+                      const OsiRowCutDebugger *debugger = model.solver()->getRowCutDebugger() ;
+                      if (debugger) {
+                        printf("On optimal path DD\n");
+                      }
+                    }
 #endif
                     model.branchAndBound();