Changeset 1329


Ignore:
Timestamp:
Jan 28, 2009 6:12:54 AM (11 years ago)
Author:
forrest
Message:

minor change to fastdual

Location:
trunk/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpModel.hpp

    r1321 r1329  
    850850      262144 - extra copy of scaled matrix
    851851      524288 - Clp fast dual
     852      1048576 - don't need to finish dual (can return 3)
    852853      NOTE - many applications can call Clp but there may be some short cuts
    853854             which are taken which are not guaranteed safe from all applications.
  • trunk/Clp/src/ClpSimplex.cpp

    r1328 r1329  
    1151311513  save += numberTotal;
    1151411514  CoinMemcpyN(upper_,numberTotal,save);
     11515  double dummyChange;
     11516  (static_cast<ClpSimplexDual *>(this))->changeBounds(3,NULL,dummyChange);
    1151511517  numberPrimalInfeasibilities_=1;
    1151611518  sumPrimalInfeasibilities_=0.5;
     
    1152011522  //if (xxxxxx)
    1152111523  //checkPrimalSolution(rowActivityWork_,columnActivityWork_);
     11524  assert((specialOptions_&16384)==0);
    1152211525  specialOptions_ |= 524288; // say use solution
    1152311526  ClpObjective * saveObjective = objective_;
    1152411527#ifndef NDEBUG
    11525   (static_cast<ClpSimplexDual *>(this))->resetFakeBounds(-1);
     11528  //(static_cast<ClpSimplexDual *>(this))->resetFakeBounds(-1);
    1152611529#endif
    1152711530  //int saveNumberFake = numberFake_;
  • trunk/Clp/src/ClpSimplexDual.cpp

    r1328 r1329  
    41344134          testTol*(fabs(thisObj)+fabs(lastObj))+testTol) {
    41354135        int maxFactor = factorization_->maximumPivots();
    4136         if ((specialOptions_&16384)==0) {
     4136        if ((specialOptions_&1048576)==0) {
    41374137          if (progress_.timesFlagged()>10)
    41384138            progress_.incrementReallyBadTimes();
     
    58065806  secondaryStatus_=0;
    58075807  // Say in fast dual
     5808  if (!alwaysFinish)
     5809    specialOptions_ |= 1048576;
    58085810  specialOptions_ |= 16384;
    58095811  int saveDont = dontFactorizePivots_;
     
    60016003  }   
    60026004  // Say not in fast dual
    6003   specialOptions_ &= ~16384;
     6005  specialOptions_ &= ~(16384|1048576);
    60046006  assert(!numberFake_||((specialOptions_&(2048|4096))!=0&&dualBound_>=1.0e8)
    60056007         ||returnCode||problemStatus_); // all bounds should be okay
Note: See TracChangeset for help on using the changeset viewer.