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

undid last commit (patches incorrectly applied)

File:
1 edited

Legend:

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

    r798 r799  
    638638{
    639639  int dummy; // for use in generalExpanded
    640   int saveFirstFree=firstFree_;
    641640  // number of pivots done
    642641  int numberPivots = factorization_->pivots();
     
    11561155  if (goToDual)
    11571156    problemStatus_=10; // try dual
    1158   // make sure first free monotonic
    1159   if (firstFree_>=0&&saveFirstFree>=0) {
    1160     firstFree_=saveFirstFree;
    1161     nextSuperBasic(1,NULL);
    1162   }
    11631157#if 0
    11641158  double thisObj = progress->lastObjective(0);
     
    23792373    if (largestDualError_>1.0e-5)
    23802374      checkValue=1.0e-1;
    2381     if (!ifValuesPass&&solveType_==1&&(saveDj*dualIn_<1.0e-20||
    2382         fabs(saveDj-dualIn_)>checkValue*(1.0+fabs(saveDj))||
    2383                         fabs(dualIn_)<dualTolerance_)) {
     2375    if (solveType_==1&&((saveDj*dualIn_<1.0e-20&&!ifValuesPass)||
     2376        fabs(saveDj-dualIn_)>checkValue*(1.0+fabs(saveDj)))) {
    23842377      char x = isColumn(sequenceIn_) ? 'C' :'R';
    23852378      handler_->message(CLP_PRIMAL_DJ,messages_)
     
    24012394        // take on more relaxed criterion
    24022395        if (saveDj*dualIn_<1.0e-20||
    2403             fabs(saveDj-dualIn_)>2.0e-1*(1.0+fabs(dualIn_))||
    2404             fabs(dualIn_)<dualTolerance_) {
     2396            fabs(saveDj-dualIn_)>2.0e-1*(1.0+fabs(dualIn_))) {
    24052397          // need to reject something
    24062398          char x = isColumn(sequenceIn_) ? 'C' :'R';
     
    24452437          int ii = index[i];
    24462438          dj_[ii] += element[ii];
    2447           reducedCost_[ii] = dj_[ii];
    24482439          element[ii]=0.0;
    24492440        }
Note: See TracChangeset for help on using the changeset viewer.