Changeset 1442 for trunk/Clp


Ignore:
Timestamp:
Oct 2, 2009 10:37:11 AM (10 years ago)
Author:
forrest
Message:

fix bad write and optional parentheses

Location:
trunk/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSimplex.cpp

    r1439 r1442  
    32763276    if (newArrays&&(specialOptions_&65536)==0) {
    32773277      delete [] cost_;
    3278       cost_ = new double[numberTotal];
     3278      cost_ = new double[2*numberTotal];
    32793279      delete [] lower_;
    32803280      delete [] upper_;
     
    1024410244      }
    1024510245#endif
    10246       if (numberIterations*(numberRows_+numberColumns_)>5.0e8) {
     10246      if (numberIterations*(numberRows_+numberColumns_)>5.0e8||
     10247          numberNodes>1.0e6) {
    1024710248        // give up
    1024810249        info->nNodes_ =-1;
  • trunk/Clp/src/ClpSimplexDual.cpp

    r1436 r1442  
    38203820#ifdef MORE_CAREFUL
    38213821    // 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()) {
    38243824      if (handler_->logLevel()>1)
    38253825        printf("forcing re-factorization\n");
     
    38273827    }
    38283828#endif
    3829   if (sequenceIn_>=0) {
     3829  if (sequenceIn_>=0) { 
    38303830    lowerIn_ = lower_[sequenceIn_];
    38313831    upperIn_ = upper_[sequenceIn_];
Note: See TracChangeset for help on using the changeset viewer.