Changeset 1791
- Timestamp:
- Jun 8, 2012 11:15:10 AM (9 years ago)
- Location:
- trunk/Cbc
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc
- Property svn:mergeinfo changed
/stable/2.7/Cbc merged: 1790
- Property svn:mergeinfo changed
-
trunk/Cbc/src/CbcMessage.cpp
r1650 r1791 69 69 {CBC_FATHOM_CHANGE, 49, 1, "Complete fathoming at depth >= %d"}, 70 70 #endif 71 {CBC_MAXITERS, 50, 1, "Exiting on maximum number of iterations"}, 71 72 {CBC_NOINT, 3007, 1, "No integer variables - nothing to do"}, 72 73 {CBC_WARNING_STRONG, 3008, 1, "Strong branching is fixing too many variables, too expensively!"}, -
trunk/Cbc/src/CbcMessage.hpp
r1650 r1791 28 28 CBC_MAXSOLS, 29 29 CBC_EVENT, 30 CBC_MAXITERS, 30 31 CBC_SOLUTION, 31 32 CBC_END_SOLUTION, -
trunk/Cbc/src/CbcModel.cpp
r1784 r1791 3918 3918 */ 3919 3919 if (!(numberNodes_ < intParam_[CbcMaxNumNode] && 3920 numberSolutions_ < intParam_[CbcMaxNumSol] && 3921 !maximumSecondsReached() && 3922 !stoppedOnGap_ && !eventHappened_ && (maximumNumberIterations_ < 0 || 3923 numberIterations_ < maximumNumberIterations_))) { 3920 numberSolutions_ < intParam_[CbcMaxNumSol] && 3921 !maximumSecondsReached() && 3922 !stoppedOnGap_ && 3923 !eventHappened_ && 3924 (maximumNumberIterations_ < 0 || numberIterations_ < maximumNumberIterations_)) 3925 ) { 3924 3926 if (tree_->size()) { 3925 3927 double dummyBest; … … 3953 3955 secondaryStatus_ = 3; 3954 3956 status_ = 1 ; 3957 } else if (maximumNumberIterations_ >= 0 && numberIterations_ >= maximumNumberIterations_) { 3958 handler_->message(CBC_MAXITERS, messages_) << CoinMessageEol ; 3959 secondaryStatus_ = 8; 3960 status_ = 1 ; 3955 3961 } else { 3962 assert(numberSolutions_ >= intParam_[CbcMaxNumSol]); 3956 3963 handler_->message(CBC_MAXSOLS, messages_) << CoinMessageEol ; 3957 3964 secondaryStatus_ = 6; -
trunk/Cbc/src/CbcModel.hpp
r1778 r1791 932 932 6 stopped on solutions 933 933 7 linear relaxation unbounded 934 8 stopped on iteration limit 934 935 */ 935 936 inline int secondaryStatus() const { -
trunk/Cbc/src/CbcSolver.cpp
r1780 r1791 2719 2719 6 stopped on solutions 2720 2720 7 linear relaxation unbounded 2721 8 stopped on iterations limit 2721 2722 */ 2722 2723 int iStatus = model2->status(); … … 2739 2740 } else if (iStatus == 3) { 2740 2741 iStatus = 1; 2741 if (iStatus2 == 9) 2742 if (iStatus2 == 9) // what does 9 mean ????????????? 2742 2743 iStatus2 = 4; 2743 2744 else … … 2752 2753 !noPrinting_) { 2753 2754 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"}; 2755 2756 sprintf(generalPrint, "\nResult - %s%s\n\n", 2756 2757 statusName[iStatus].c_str(),
Note: See TracChangeset
for help on using the changeset viewer.