Changeset 491


Ignore:
Timestamp:
Oct 27, 2004 5:05:14 PM (15 years ago)
Author:
forrest
Message:

for Marc

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSimplex.cpp

    r488 r491  
    54635463  // Get rid of some arrays and empty factorization
    54645464  int useFactorization=false;
    5465   if ((startFinishOptions&2)!=0)
     5465  if ((startFinishOptions&2)!=0&&(whatsChanged_&(2+512))==2+512)
    54665466    useFactorization=true; // Keep factorization if possible
    54675467  // sanity check
  • trunk/ClpSimplexDual.cpp

    r490 r491  
    36573657  // for now let ...iBasic give pivot row
    36583658  int useFactorization=false;
    3659   if ((startFinishOptions&2)!=0)
     3659  if ((startFinishOptions&2)!=0&&(whatsChanged_&(2+512))==2+512)
    36603660    useFactorization=true; // Keep factorization if possible
    36613661  if (!useFactorization||factorization_->numberRows()!=numberRows_) {
  • trunk/Test/unitTest.cpp

    r489 r491  
    692692    model.dual(0,2+4); // use factorization and arrays
    693693    model.dual(0,2); // hopefully will not use factorization
     694    model.primal(0,3+4); // keep factorization
     695    // but say basis has changed
     696    model.setWhatsChanged(model.whatsChanged()&(~2));
     697    model.dual(0,2); // hopefully will not use factorization
    694698  }
    695699  // test steepest edge
  • trunk/include/ClpModel.hpp

    r481 r491  
    520520  inline void * getUserPointer () const
    521521  { return userPointer_;};
     522  /// What has changed in model (only for masochistic users)
     523  inline int whatsChanged() const
     524          { return whatsChanged_;} ;
     525  inline void setWhatsChanged(int value)
     526          { whatsChanged_ = value;} ;
    522527  //@}
    523528  /**@name Message handling */
     
    754759        128 - column lbs not changed
    755760        256 - column ubs not changed
     761        512 - basis not changed (up to user to set this to 0)
    756762              top bits may be used internally
    757763  */
Note: See TracChangeset for help on using the changeset viewer.