Ignore:
Timestamp:
Jun 9, 2006 3:26:50 PM (13 years ago)
Author:
andreasw
Message:

undid last commit (patches incorrectly applied)

File:
1 edited

Legend:

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

    r798 r799  
    16981698  double tolerance = dualTolerance_;
    16991699  // we can't really trust infeasibilities if there is dual error
    1700   double error = CoinMin(1.0e-2,largestDualError_);
     1700  double error = CoinMin(1.0e-3,largestDualError_);
    17011701  // allow tolerance at least slightly bigger than standard
    17021702  tolerance = tolerance +  error;
     
    36143614            cleanDuals=1;
    36153615            // make sure fake bounds are back
    3616             //computeObjectiveValue();
    36173616            changeBounds(true,NULL,changeCost);
    3618             //computeObjectiveValue();
    36193617            createRim(4);
    36203618            // make sure duals are current
    3621             computeDuals(givenDuals);
    3622             checkDualSolution();
     3619            //computeDuals(givenDuals);
     3620            //checkDualSolution();
    36233621            //if (numberDualInfeasibilities_)
    36243622              numberChanged_=1; // force something to happen
    3625             //else
    3626             //computeObjectiveValue();
     3623              //else
     3624              computeObjectiveValue();
    36273625          }
    36283626          if (lastCleaned<numberIterations_&&numberTimesOptimal_<4&&
     
    39783976           limit&&
    39793977           !numberAtFakeBound()&&!numberDualInfeasibilities_) {
    3980     //printf("lim %g obj %g %g\n",limit,objectiveValue_,objectiveValue());
    39813978    problemStatus_=1;
    39823979    secondaryStatus_ = 1; // and say was on cutoff
     
    41894186  double maximumFraction = 1.0e-5;
    41904187  double constantPerturbation = 100.0*dualTolerance_;
     4188  const int * lengths = matrix_->getVectorLengths();
    41914189  int maxLength=0;
    41924190  int minLength=numberRows_;
     
    42484246  for (iColumn=0;iColumn<numberColumns_;iColumn++) {
    42494247    if (columnLowerWork_[iColumn]<columnUpperWork_[iColumn]) {
    4250       int length = matrix_->getVectorLength(iColumn);
     4248      int length = lengths[iColumn];
    42514249      if (length>2) {
    42524250        maxLength = CoinMax(maxLength,length);
     
    44544452      }
    44554453      if (value) {
    4456         int length = matrix_->getVectorLength(iColumn);
     4454        int length = lengths[iColumn];
    44574455        if (length>3) {
    44584456          length = (int) ((double) length * factor);
Note: See TracChangeset for help on using the changeset viewer.