Ignore:
Timestamp:
Jun 9, 2006 3:26:50 PM (14 years ago)
Author:
andreasw
Message:

undid last commit (patches incorrectly applied)

File:
1 edited

Legend:

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

    r798 r799  
    1414//#define COIN_USE_CLP
    1515//#endif
    16 #include "ClpPackedMatrix.hpp"
     16#include "ClpMatrixBase.hpp"
    1717#include "CoinMessageHandler.hpp"
    1818#include "ClpParameters.hpp"
     
    571571      and new is used)
    572572      So up to user to delete current.  This was used where
    573       matrices were being rotated. ClpModel takes ownership.
    574   /** Replace Clp Matrix (current is not deleted unless told to
    575       and new is used) So up to user to delete current.  This was used where
    576       matrices were being rotated.  This version changes CoinPackedMatrix
    577       to ClpPackedMatrix.  ClpModel takes ownership.
    578   */
    579    inline void replaceMatrix(CoinPackedMatrix * matrix,
    580                              bool deleteCurrent=false)
    581   { replaceMatrix(new ClpPackedMatrix(matrix),deleteCurrent);};
     573      matrices were being rotated.
    582574  */
    583575   void replaceMatrix(ClpMatrixBase * matrix,bool deleteCurrent=false);
     
    770762        return false;
    771763      }
    772     /// Create C++ lines to get to current state
    773     void generateCpp( FILE * fp);
    774764    }
    775765#endif
Note: See TracChangeset for help on using the changeset viewer.