Ignore:
Timestamp:
Jun 9, 2006 10:05:57 PM (14 years ago)
Author:
ladanyi
Message:

finishing conversion to svn

File:
1 edited

Legend:

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

    r799 r800  
    16981698  double tolerance = dualTolerance_;
    16991699  // we can't really trust infeasibilities if there is dual error
    1700   double error = CoinMin(1.0e-3,largestDualError_);
     1700  double error = CoinMin(1.0e-2,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();
    36163617            changeBounds(true,NULL,changeCost);
     3618            //computeObjectiveValue();
    36173619            createRim(4);
    36183620            // make sure duals are current
    3619             //computeDuals(givenDuals);
    3620             //checkDualSolution();
     3621            computeDuals(givenDuals);
     3622            checkDualSolution();
    36213623            //if (numberDualInfeasibilities_)
    36223624              numberChanged_=1; // force something to happen
    3623               //else
    3624               computeObjectiveValue();
     3625            //else
     3626            //computeObjectiveValue();
    36253627          }
    36263628          if (lastCleaned<numberIterations_&&numberTimesOptimal_<4&&
     
    39763978           limit&&
    39773979           !numberAtFakeBound()&&!numberDualInfeasibilities_) {
     3980    //printf("lim %g obj %g %g\n",limit,objectiveValue_,objectiveValue());
    39783981    problemStatus_=1;
    39793982    secondaryStatus_ = 1; // and say was on cutoff
     
    41864189  double maximumFraction = 1.0e-5;
    41874190  double constantPerturbation = 100.0*dualTolerance_;
    4188   const int * lengths = matrix_->getVectorLengths();
    41894191  int maxLength=0;
    41904192  int minLength=numberRows_;
     
    42464248  for (iColumn=0;iColumn<numberColumns_;iColumn++) {
    42474249    if (columnLowerWork_[iColumn]<columnUpperWork_[iColumn]) {
    4248       int length = lengths[iColumn];
     4250      int length = matrix_->getVectorLength(iColumn);
    42494251      if (length>2) {
    42504252        maxLength = CoinMax(maxLength,length);
     
    44524454      }
    44534455      if (value) {
    4454         int length = lengths[iColumn];
     4456        int length = matrix_->getVectorLength(iColumn);
    44554457        if (length>3) {
    44564458          length = (int) ((double) length * factor);
Note: See TracChangeset for help on using the changeset viewer.