Changeset 89


Ignore:
Timestamp:
Jan 9, 2003 11:47:01 AM (17 years ago)
Author:
forrest
Message:

Synchronize relaxed tolerances

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpDualRowSteepest.cpp

    r87 r89  
    131131  double tolerance=model_->currentPrimalTolerance();
    132132  // we can't really trust infeasibilities if there is primal error
    133   if (model_->largestPrimalError()>1.0e-8)
    134     tolerance *= model_->largestPrimalError()/1.0e-8;
     133  // this coding has to mimic coding in checkPrimalSolution
     134  double error = min(1.0e-3,model_->largestPrimalError());
     135  // allow tolerance at least slightly bigger than standard
     136  tolerance = tolerance +  error;
    135137  tolerance *= tolerance; // as we are using squares
    136138  double * solution = model_->solutionRegion();
  • trunk/ClpPrimalColumnSteepest.cpp

    r63 r89  
    159159  double * infeas = infeasible_->denseVector();
    160160  double tolerance=model_->currentDualTolerance();
     161  // we can't really trust infeasibilities if there is dual error
     162  // this coding has to mimic coding in checkDualSolution
     163  double error = min(1.0e-3,model_->largestDualError());
     164  // allow tolerance at least slightly bigger than standard
     165  tolerance = tolerance +  error;
    161166  int pivotRow = model_->pivotRow();
    162167
Note: See TracChangeset for help on using the changeset viewer.