- Timestamp:
- Oct 2, 2009 10:37:11 AM (11 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpSimplex.cpp
r1439 r1442 3276 3276 if (newArrays&&(specialOptions_&65536)==0) { 3277 3277 delete [] cost_; 3278 cost_ = new double[ numberTotal];3278 cost_ = new double[2*numberTotal]; 3279 3279 delete [] lower_; 3280 3280 delete [] upper_; … … 10244 10244 } 10245 10245 #endif 10246 if (numberIterations*(numberRows_+numberColumns_)>5.0e8) { 10246 if (numberIterations*(numberRows_+numberColumns_)>5.0e8|| 10247 numberNodes>1.0e6) { 10247 10248 // give up 10248 10249 info->nNodes_ =-1; -
trunk/Clp/src/ClpSimplexDual.cpp
r1436 r1442 3820 3820 #ifdef MORE_CAREFUL 3821 3821 // If we have done pivots and things look bad set alpha_ 0.0 to force factorization 3822 if(badSumPivots||3823 fabs(theta_*badFree)>10.0*dualTolerance_&&factorization_->pivots()) {3822 if ((badSumPivots|| 3823 fabs(theta_*badFree)>10.0*dualTolerance_)&&factorization_->pivots()) { 3824 3824 if (handler_->logLevel()>1) 3825 3825 printf("forcing re-factorization\n"); … … 3827 3827 } 3828 3828 #endif 3829 if (sequenceIn_>=0) { 3829 if (sequenceIn_>=0) { 3830 3830 lowerIn_ = lower_[sequenceIn_]; 3831 3831 upperIn_ = upper_[sequenceIn_];
Note: See TracChangeset
for help on using the changeset viewer.