Changeset 749


Ignore:
Timestamp:
Apr 20, 2006 9:14:03 AM (13 years ago)
Author:
forrest
Message:

hopefully more accurate

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpModel.cpp

    r748 r749  
    6666  rowScale_(NULL),
    6767  columnScale_(NULL),
    68   scalingFlag_(2),
     68  scalingFlag_(3),
    6969  status_(NULL),
    7070  integerType_(NULL),
  • trunk/ClpPackedMatrix.cpp

    r740 r749  
    19711971      } else {
    19721972        assert (scalingMethod==4);
    1973         if (overallSmallest>savedOverallRatio)
     1973        if (overallSmallest>2.0*savedOverallRatio)
    19741974          finished=true; // geometric was better
    19751975        else
  • trunk/ClpSimplexPrimal.cpp

    r748 r749  
    716716                setFlagged(sequenceOut_);
    717717              }
    718               double newTolerance = 0.05 + 0.94*CoinDrand48();
     718              double newTolerance = CoinMax(0.5 + 0.499*CoinDrand48(),factorization_->pivotTolerance());
    719719              factorization_->pivotTolerance(newTolerance);
    720720            } else {
Note: See TracChangeset for help on using the changeset viewer.