Ignore:
Timestamp:
Jun 8, 2012 11:15:10 AM (8 years 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc

  • trunk/Cbc/src/CbcSolver.cpp

    r1780 r1791  
    27192719                                   6 stopped on solutions
    27202720                                   7 linear relaxation unbounded
     2721                                   8 stopped on iterations limit
    27212722                                */
    27222723                                int iStatus = model2->status();
     
    27392740                                } else if (iStatus == 3) {
    27402741                                    iStatus = 1;
    2741                                     if (iStatus2 == 9)
     2742                                    if (iStatus2 == 9)  // what does 9 mean ?????????????
    27422743                                        iStatus2 = 4;
    27432744                                    else
     
    27522753                                    !noPrinting_) {
    27532754                                   std::string statusName[] = {"", "Stopped on ", "Run abandoned", "", "", "User ctrl-c"};
    2754                                    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"};
     2755                                   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"};
    27552756                                   sprintf(generalPrint, "\nResult - %s%s\n\n",
    27562757                                           statusName[iStatus].c_str(),
Note: See TracChangeset for help on using the changeset viewer.