Changeset 458


Ignore:
Timestamp:
Sep 29, 2004 3:51:11 PM (15 years ago)
Author:
forrest
Message:

So can switch off dual part of presolve

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpPresolve.cpp

    r450 r458  
    4949  nelems_(0),
    5050  numberPasses_(5),
    51   saveFile_("")
     51  saveFile_(""),
     52  presolveActions_(0)
    5253{
    5354}
     
    389390  if (prob->anyProhibited())
    390391    doDualStuff=false;
    391 
     392  if ((presolveActions_&1)!=0)
     393    doDualStuff=false;
    392394#if     PRESOLVE_CONSISTENCY
    393395//  presolve_links_ok(prob->rlink_, prob->mrstrt_, prob->hinrow_, prob->nrows_);
     
    459461    check_sol(prob,1.0e0);
    460462#endif
     463    if (dupcol) {
     464      //paction_ = dupcol_action::presolve(prob, paction_);
     465    }
    461466
    462467    // Check number rows dropped
  • trunk/include/ClpPresolve.hpp

    r439 r458  
    6969  inline double nonLinearValue() const
    7070    { return nonLinearValue_;};
     71  /// Whether we want to do dual part of presolve
     72  inline bool doDualPresolve() const
     73  { return (presolveActions_&1)==0;};
     74  inline void setDoDualPresolve(bool doDual)
     75  { if (doDual) presolveActions_  &= ~1; else presolveActions_ |= 1;};
    7176
    7277  /**@name postsolve - postsolve the problem.  If the problem
     
    115120  /// Name of saved model file
    116121  std::string saveFile_;
    117 
     122  /// Whether we want to skip dual part of presolve etc
     123  int presolveActions_;
    118124protected:
    119125  /// If you want to apply the individual presolve routines differently,
Note: See TracChangeset for help on using the changeset viewer.