Changeset 1425 for trunk/Clp


Ignore:
Timestamp:
Aug 24, 2009 3:28:23 AM (10 years ago)
Author:
forrest
Message:

trying to put fix in again

File:
1 edited

Legend:

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

    r1423 r1425  
    57485748  // save stuff
    57495749  ClpFactorization saveFactorization(*factorization_);
     5750  // Get fake bounds correctly
     5751  double changeCost;
     5752  changeBounds(3,NULL,changeCost);
     5753  int saveNumberFake=numberFake_;
    57505754  // save basis and solution
    57515755  double * saveSolution = new double[numberRows_+numberColumns_];
     
    57855789    else
    57865790      upper_[iColumn] = (newUpper[i]*inverseColumnScale_[iColumn])*rhsScale_; // scale
    5787     // Get fake bounds correctly
    5788     double changeCost;
    5789     changeBounds(3,NULL,changeCost);
    57905791    // Start of fast iterations
    57915792    int status = fastDual(alwaysFinish);
     
    58245825    iSolution++;
    58255826    // restore
     5827    numberFake_=saveNumberFake;
    58265828    CoinMemcpyN(saveSolution,
    58275829            numberRows_+numberColumns_,solution_);
     
    58535855    else
    58545856      lower_[iColumn] = (newLower[i]*inverseColumnScale_[iColumn])*rhsScale_; // scale
    5855     // Get fake bounds correctly
    5856     resetFakeBounds(1);
    58575857    // Start of fast iterations
    58585858    status = fastDual(alwaysFinish);
     
    58905890
    58915891    // restore
     5892    numberFake_=saveNumberFake;
    58925893    CoinMemcpyN(saveSolution,
    58935894            numberRows_+numberColumns_,solution_);
     
    70347035      } else if (status==superBasic||status==isFree) {
    70357036        nSuperBasic++;
    7036         printf("** free or superbasic %c%d %g <= %g <= %g true %g, %g - status %d\n",
    7037                RC,jSequence,lower_[iSequence],solution_[iSequence],
    7038                upper_[iSequence],lowerValue,upperValue,status);
     7037        //printf("** free or superbasic %c%d %g <= %g <= %g true %g, %g - status %d\n",
     7038        //     RC,jSequence,lower_[iSequence],solution_[iSequence],
     7039        //     upper_[iSequence],lowerValue,upperValue,status);
    70397040      } else if (status==basic) {
    70407041        bool odd=false;
Note: See TracChangeset for help on using the changeset viewer.