Changeset 410


Ignore:
Timestamp:
Aug 23, 2004 12:06:41 PM (15 years ago)
Author:
forrest
Message:

for Richard Waltz

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpModel.cpp

    r409 r410  
    15321532// Replace Clp Matrix (current is not deleted)
    15331533void
    1534 ClpModel::replaceMatrix( ClpMatrixBase * matrix)
    1535 {
     1534ClpModel::replaceMatrix( ClpMatrixBase * matrix,bool deleteCurrent)
     1535{
     1536  if (deleteCurrent)
     1537    delete matrix_;
    15361538  matrix_=matrix;
    15371539}
  • trunk/include/ClpModel.hpp

    r409 r410  
    391391   /// Clp Matrix
    392392   inline ClpMatrixBase * clpMatrix() const     { return matrix_; }
    393   /** Replace Clp Matrix (current is not deleted and new is used)
    394       So up to user to delete one
     393  /** Replace Clp Matrix (current is not deleted unless told to
     394      and new is used)
     395      So up to user to delete current.  This was used where
     396      matrices were being rotated.
    395397  */
    396    void replaceMatrix(ClpMatrixBase * matrix);
     398   void replaceMatrix(ClpMatrixBase * matrix,bool deleteCurrent=false);
    397399   /// Objective value
    398400   inline double objectiveValue() const {
Note: See TracChangeset for help on using the changeset viewer.