Changeset 2134


Ignore:
Timestamp:
Mar 22, 2015 12:40:43 PM (4 years ago)
Author:
forrest
Message:

allow dependency

Location:
stable/1.16/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.16/Clp/src/ClpPresolve.cpp

    r2081 r2134  
    10101010            paction_ = duprow_action::presolve(prob, paction_);
    10111011            printProgress('D',0);
     1012            //paction_ = doubleton_action::presolve(prob, paction_);
     1013            //printProgress('d',0);
     1014            //if (doDependency()) {
     1015              //paction_ = duprow3_action::presolve(prob, paction_);
     1016              //printProgress('Z',0);
     1017            //}
    10121018          }
    10131019          if (doGubrow()) {
     
    10161022               printProgress('E',0);
    10171023          }
     1024          if (ifree) {
     1025            int fill_level=10;
     1026            const CoinPresolveAction * lastAction = NULL;
     1027            int iPass=4;
     1028            while(lastAction!=paction_&&iPass) {
     1029              lastAction=paction_;
     1030              paction_ = implied_free_action::presolve(prob, paction_, fill_level);
     1031              printProgress('l',0);
     1032              iPass--;
     1033            }
     1034          }
    10181035
    10191036          if ((presolveActions_ & 16384) != 0)
     
    13661383#endif
    13671384          }
     1385     }
     1386     if (!prob->status_&&doDependency()) {
     1387       paction_ = duprow3_action::presolve(prob, paction_);
     1388       printProgress('Z',0);
    13681389     }
    13691390     prob->presolveOptions_ &= ~0x10000;
     
    17241745     feasibilityTolerance_(0.0),
    17251746     status_(-1),
     1747     pass_(0),
    17261748     colsToDo_(new int [ncols0_in]),
    17271749     numberColsToDo_(0),
  • stable/1.16/Clp/src/ClpPresolve.hpp

    r2074 r2134  
    152152          else presolveActions_ |= 256;
    153153     }
     154     /// Whether we want to do dependency part of presolve
     155     inline bool doDependency() const {
     156          return (presolveActions_ & 32768) != 0;
     157     }
     158     inline void setDoDependency(bool doDependency) {
     159          if (doDependency) presolveActions_  |= 32768;
     160          else presolveActions_ &= ~32768;
     161     }
    154162     /// Whether we want to do singleton column part of presolve
    155163     inline bool doSingletonColumn() const {
  • stable/1.16/Clp/src/ClpSimplex.cpp

    r2114 r2134  
    56155615     }
    56165616     if ((moreSpecialOptions_&524288)!=0&&
    5617          !nonLinearCost_->numberInfeasibilities()&&
     5617         (!nonLinearCost_||!nonLinearCost_->numberInfeasibilities())&&
    56185618         fabs(dblParam_[ClpDualObjectiveLimit])>1.0e30) {
    56195619       problemStatus_=0;
Note: See TracChangeset for help on using the changeset viewer.