Changeset 2315


Ignore:
Timestamp:
Feb 24, 2018 12:02:28 PM (10 months ago)
Author:
forrest
Message:

allow update of solver sos info from cbcmodel

Location:
trunk/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSimplex.cpp

    r2309 r2315  
    54045404          }
    54055405          for (iColumn = 0; iColumn < numberColumns_; iColumn++) {
    5406                if (saveUpper[iColumn] > saveLower[iColumn] + useTolerance) {
     5406               if (saveUpper[iColumn] > saveLower[iColumn] + tolerance) {
    54075407                    // Make large bounds stay infinite
    54085408                    if (saveUpper[iColumn] > 1.0e30 && columnUpper_[iColumn] > 1.0e10) {
  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r2299 r2315  
    1048210482  setWarmStart(NULL);
    1048310483}
     10484// Replace setInfo (takes over ownership)
     10485void
     10486OsiClpSolverInterface::replaceSetInfo(int numberSOS,CoinSet * setInfo)
     10487{
     10488  delete [] setInfo_;
     10489  numberSOS_ = numberSOS;
     10490  setInfo_ = setInfo;
     10491}
    1048410492 
    1048510493//#############################################################################
  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.hpp

    r2299 r2315  
    685685  inline const CoinSet * setInfo() const
    686686  { return setInfo_;}
     687  /// Replace setInfo (takes over ownership)
     688  void replaceSetInfo(int numberSOS,CoinSet * setInfo);
    687689  /** \brief Identify integer variables and SOS and create corresponding objects.
    688690 
Note: See TracChangeset for help on using the changeset viewer.