Changeset 1791

Timestamp:

Jun 8, 2012 11:15:10 AM (21 months ago)

Author:

stefan

Message:

merge r1790 from stable/2.7 (correct message if iterlim reached) and introduce secondaryStatus 8 for stop at iteration limit

Location:

trunk/Cbc

Files:

• . (modified) (1 prop)
• src/CbcMessage.cpp (modified) (1 diff)
• src/CbcMessage.hpp (modified) (1 diff)
• src/CbcModel.cpp (modified) (2 diffs)
• src/CbcModel.hpp (modified) (1 diff)
• src/CbcSolver.cpp (modified) (3 diffs)

trunk/Cbc/src/CbcMessage.cpp

@@ -69 +69 @@
     {CBC_FATHOM_CHANGE, 49, 1, "Complete fathoming at depth >= %d"},
 #endif
+    {CBC_MAXITERS, 50, 1, "Exiting on maximum number of iterations"},
     {CBC_NOINT, 3007, 1, "No integer variables - nothing to do"},
     {CBC_WARNING_STRONG, 3008, 1, "Strong branching is fixing too many variables, too expensively!"},

trunk/Cbc/src/CbcMessage.hpp

@@ -28 +28 @@
     CBC_MAXSOLS,
     CBC_EVENT,
+    CBC_MAXITERS,
     CBC_SOLUTION,
     CBC_END_SOLUTION,

trunk/Cbc/src/CbcModel.cpp

@@ -3914 +3914 @@
     */
     if (!(numberNodes_ < intParam_[CbcMaxNumNode] &&
-            numberSolutions_ < intParam_[CbcMaxNumSol] &&
-            !maximumSecondsReached() &&
-            !stoppedOnGap_ && !eventHappened_ && (maximumNumberIterations_ < 0 ||
-                                                  numberIterations_ < maximumNumberIterations_))) {
+          numberSolutions_ < intParam_[CbcMaxNumSol] &&
+          !maximumSecondsReached() &&
+          !stoppedOnGap_ &&
+          !eventHappened_ &&
+          (maximumNumberIterations_ < 0 || numberIterations_ < maximumNumberIterations_))
+         ) {
         if (tree_->size()) {
             double dummyBest;
@@ -3949 +3951 @@
             secondaryStatus_ = 3;
             status_ = 1 ;
+        } else if (maximumNumberIterations_ >= 0 && numberIterations_ >= maximumNumberIterations_) {
+            handler_->message(CBC_MAXITERS, messages_) << CoinMessageEol ;
+            secondaryStatus_ = 8;
+            status_ = 1 ;
         } else {
+            assert(numberSolutions_ >= intParam_[CbcMaxNumSol]);
             handler_->message(CBC_MAXSOLS, messages_) << CoinMessageEol ;
             secondaryStatus_ = 6;

trunk/Cbc/src/CbcModel.hpp

@@ -932 +932 @@
         6 stopped on solutions
         7 linear relaxation unbounded
+        8 stopped on iteration limit
     */
     inline int secondaryStatus() const {

trunk/Cbc/src/CbcSolver.cpp

@@ -2719 +2719 @@
                                    6 stopped on solutions
                                    7 linear relaxation unbounded
+                                   8 stopped on iterations limit
                                 */
                                 int iStatus = model2->status();
@@ -2739 +2740 @@
                                 } else if (iStatus == 3) {
                                     iStatus = 1;
-                                    if (iStatus2 == 9)
+                                    if (iStatus2 == 9)  // what does 9 mean ?????????????
                                         iStatus2 = 4;
                                     else
@@ -2752 +2753 @@
                                     !noPrinting_) {
                                    std::string statusName[] = {"", "Stopped on ", "Run abandoned", "", "", "User ctrl-c"};
-                                   std::string minor[] = {"Optimal solution found", "Linear relaxation infeasible", "Optimal solution found (within gap tolerance)", "node limit", "time limit", "user ctrl-c", "solution limit", "Linear relaxation unbounded", "Problem proven infeasible"};
+                                   std::string minor[] = {"Optimal solution found", "Linear relaxation infeasible", "Optimal solution found (within gap tolerance)", "node limit", "time limit", "user ctrl-c", "solution limit", "Linear relaxation unbounded", "iterations limit", "Problem proven infeasible"};
                                    sprintf(generalPrint, "\nResult - %s%s\n\n", 
                                            statusName[iStatus].c_str(),