Ignore:
Timestamp:
Jan 14, 2009 4:14:09 PM (11 years ago)
Author:
forrest
Message:

out compiler warnings and stability improvements

File:
1 edited

Legend:

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

    r1276 r1321  
    482482          if (numberTimesOptimal_==1) {
    483483            // better to have small tolerance even if slower
    484             factorization_->zeroTolerance(1.0e-15);
     484            factorization_->zeroTolerance(CoinMin(factorization_->zeroTolerance(),1.0e-15));
    485485          }
    486486          lastCleaned=numberIterations_;
     
    24912491    // major error
    24922492    // better to have small tolerance even if slower
    2493     factorization_->zeroTolerance(1.0e-15);
     2493    factorization_->zeroTolerance(CoinMin(factorization_->zeroTolerance(),1.0e-15));
    24942494    int maxFactor = factorization_->maximumPivots();
    24952495    if (maxFactor>10) {
     
    38843884        CoinMemcpyN(saveSolution+numberColumns2,
    38853885                    numberRows,newModel.primalRowSolution());
    3886         CoinMemcpyN((unsigned char *) saveStatus,
     3886        CoinMemcpyN(reinterpret_cast<unsigned char *> (saveStatus),
    38873887                    numberColumns2+numberRows,newModel.statusArray());
    38883888        for (jNon=0;jNon<numberNonLinearColumns;jNon++)
     
    40034003                numberRows,saveSolution+numberColumns2);
    40044004    CoinMemcpyN(newModel.statusArray(),
    4005                 numberColumns2+numberRows,(unsigned char *) saveStatus);
     4005                numberColumns2+numberRows,
     4006                reinterpret_cast<unsigned char *> (saveStatus));
    40064007   
    40074008    targetDrop=infPenalty+infPenalty2;
Note: See TracChangeset for help on using the changeset viewer.