Changeset 2355 for trunk/Cbc/src/CbcModel.cpp

Timestamp:

Jan 5, 2018 4:46:19 AM (3 years ago)

Author:

forrest

Message:

opt out of small B&B quickly

File:

• trunk/Cbc/src/CbcModel.cpp (modified) (7 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -16385 +16385 @@
                         }
                         ClpSimplex * simplex = clpSolver->getModelPtr();
+                        double * saveLower =
+                          CoinCopyOfArray(solver_->getColLower(),numberColumns);
+                        double * saveUpper =
+                          CoinCopyOfArray(solver_->getColUpper(),numberColumns);
                         if (allSame && false) {
                             // change priorities on general
@@ -16435 +16439 @@
                         incrementExtra(info->numberNodesExplored_,
                                        info->numberIterations_);
+                        if (feasible) {
+                          double objValue=simplex->objectiveValue();
+                          feasible = solveWithCuts(cuts, 1, node);
+                          if (!feasible) {
+                            if ((specialOptions_&1) != 0)
+                              printf("small was feasible %g now infeasible! - depths %d %d\n",
+                                     objValue,node->depth(),fastNodeDepth_);
+                            // switch off
+                            info->nNodes_=-99;
+                            solver_->setColLower(saveLower);
+                            solver_->setColUpper(saveUpper);
+                          }
+                        }
                         char general[200];
                         int fathomStatus=info->nNodes_;
@@ -16462 +16479 @@
                             //abort();
                           fastNodeDepth_ -= (info->nNodes_==-10) ? 5 : 2;
+                          if (info->nNodes_==-99)
+                            fastNodeDepth_=-1; // switch off
 #ifndef NO_FATHOM_PRINT
                           if ((moreSpecialOptions_&262144) != 0)
@@ -16483 +16502 @@
                                     CoinCopyOfArray(simplex->primalColumnSolution(),
                                                     numberColumns);
+                                double saveBest = bestObjective_;
                                 setBestSolution(CBC_STRONGSOL, value, newSolution) ;
                                 delete [] newSolution;
-                                //solver_->setColLower(saveLower);
-                                //solver_->setColUpper(saveUpper);
-                                //delete [] saveLower;
-                                //delete [] saveUpper;
+                                if (bestObjective_==saveBest) {
+                                  if ((specialOptions_&1) != 0)
+                                    printf("small was feasible now just infeasible! - depths %d %d\n",
+                                           node->depth(),fastNodeDepth_);
+                                  fastNodeDepth_=-1; // switch off
+                                  solver_->setColLower(saveLower);
+                                  solver_->setColUpper(saveUpper);
+                                }
                             }
                             // say feasible so will redo node
@@ -16500 +16524 @@
                                     CoinCopyOfArray(simplex->primalColumnSolution(),
                                                     numberColumns);
+                                double saveBest = bestObjective_;
                                 setBestSolution(CBC_STRONGSOL, value, newSolution) ;
                                 // in case of inaccuracy
@@ -16505 +16530 @@
                                                                    simplex->objectiveValue()));
                                 delete [] newSolution;
+                                if (bestObjective_==saveBest) {
+                                  if ((specialOptions_&1) != 0)
+                                    printf("small was feasible now just infeasible! - depths %d %d\n",
+                                           node->depth(),fastNodeDepth_);
+                                  fastNodeDepth_=-1; // switch off
+                                  solver_->setColLower(saveLower);
+                                  solver_->setColUpper(saveUpper);
+                                }
                             }
                             // update pseudo costs
@@ -16534 +16567 @@
                             //printf("range of costs %g to %g\n",smallest,largest);
                         }
+                        delete [] saveLower;
+                        delete [] saveUpper;
                         simplex->setLogLevel(saveLevel);
 #ifdef COIN_HAS_CPX