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

Timestamp:

May 10, 2011 8:33:58 AM (10 years ago)

Author:

forrest

Message:

messages for fathoming plus soem attempts at robustness

File:

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

trunk/Cbc/src/CbcModel.cpp

@@ -3357 +3357 @@
     int lastPrintEvery = 0;
     int numberConsecutiveInfeasible = 0;
+#define PERTURB_IN_FATHOM
+#ifdef PERTURB_IN_FATHOM
+    // allow in fathom
+    if ((moreSpecialOptions_& 262144) != 0)
+      specialOptions_ |= 131072;
+#endif
     while (true) {
         lockThread();
@@ -3397 +3403 @@
                     // switch off perturbation
                     simplex->setPerturbation(100);
-#ifdef PERTURB_IN_FATHOM
-                    // but allow in fathom
-                    specialOptions_ |= 131072;
-#endif
 #ifdef CLP_INVESTIGATE
                     printf("Perturbation switched off\n");
@@ -3765 +3767 @@
             node = tree_->bestNode(cutoff) ;
             // Possible one on tree worse than cutoff
-            // Wierd comparison function can leave ineligible nodes on tree
+            // Weird comparison function can leave ineligible nodes on tree
             if (!node || node->objectiveValue() > cutoff)
                 continue;
@@ -12945 +12947 @@
                               break;
                             }
+                            reducedCostFix();
                         } else {
                             // NOT better solution
@@ -13523 +13526 @@
                             simplex->setLogLevel(0);
                         clpSolver->setBasis();
-#ifdef PERTURB_IN_FATHOM
                         int perturbation = simplex->perturbation();
                         if ((specialOptions_&131072) != 0) {
-                            assert (perturbation == 100);
+                            //assert (perturbation == 100);
                             simplex->setPerturbation(50);
                         }
+                        int saveMoreOptions = simplex->moreSpecialOptions();
+                        int flags = (moreSpecialOptions_>>18)&3;
+                        simplex->setMoreSpecialOptions(saveMoreOptions|flags<<11);
+#ifndef NO_FATHOM_PRINT
+                        info->startingDepth_ = node->depth();
+                        info->nodeCalled_ = numberNodes_;
+                        info->handler_ = handler_;
 #endif
                         feasible = simplex->fathom(info) != 0;
-#ifdef PERTURB_IN_FATHOM
+                        simplex->setMoreSpecialOptions(saveMoreOptions);
                         simplex->setPerturbation(perturbation);
-#endif
                         numberExtraNodes_ += info->numberNodesExplored_;
                         numberExtraIterations_ += info->numberIterations_;
-                        if (info->numberNodesExplored_ > 10000) {
+                        if (info->numberNodesExplored_ > 10000 /* && !feasible */ 
+                            && (moreSpecialOptions_&524288) == 0  && info->nNodes_>=0) {
                             fastNodeDepth_ --;
+#ifndef NO_FATHOM_PRINT
+                            if ((moreSpecialOptions_&262144) != 0)
+                              handler_->message(CBC_FATHOM_CHANGE, messages_) << 
+                                FATHOM_BIAS - fastNodeDepth_ << CoinMessageEol ;
+#endif
 #ifdef CLP_INVESTIGATE
                             printf(">10000 - depth now %d so at depth >= %d\n",
@@ -13546 +13560 @@
                             // we gave up
                             //abort();
-                            fastNodeDepth_ -= 2;
+                            fastNodeDepth_ -= 3;
+#ifndef NO_FATHOM_PRINT
+                          if ((moreSpecialOptions_&262144) != 0)
+                            handler_->message(CBC_FATHOM_CHANGE, messages_) << 
+                              FATHOM_BIAS - fastNodeDepth_ << CoinMessageEol ;
+#endif
 #ifdef CLP_INVESTIGATE
                             printf("fastNodeDepth now %d - so at depth >= %d\n",