Ignore:
Timestamp:
Jun 8, 2007 6:26:07 AM (12 years ago)
Author:
forrest
Message:

to try and help with trunk branches mess

File:
1 edited

Legend:

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

    r872 r1015  
    8787  intParam_[ClpMaxNumIteration] = 2147483647;
    8888  intParam_[ClpMaxNumIterationHotStart] = 9999999;
     89  intParam_[ClpNameDiscipline] = 0;
    8990
    9091  dblParam_[ClpDualObjectiveLimit] = COIN_DBL_MAX;
     
    646647  intParam_[ClpMaxNumIterationHotStart] =
    647648    rhs.intParam_[ClpMaxNumIterationHotStart];
     649  intParam_[ClpNameDiscipline] = rhs.intParam_[ClpNameDiscipline] ;
    648650
    649651  dblParam_[ClpDualObjectiveLimit] = rhs.dblParam_[ClpDualObjectiveLimit];
     
    821823    break;
    822824  case ClpMaxNumIterationHotStart:
     825    if (value < 0)
     826      return false;
     827    break;
     828  case ClpNameDiscipline:
    823829    if (value < 0)
    824830      return false;
     
    27472753  intParam_[ClpMaxNumIterationHotStart] =
    27482754    rhs->intParam_[ClpMaxNumIterationHotStart];
     2755  intParam_[ClpNameDiscipline] = rhs->intParam_[ClpNameDiscipline] ;
    27492756
    27502757  dblParam_[ClpDualObjectiveLimit] = rhs->dblParam_[ClpDualObjectiveLimit];
Note: See TracChangeset for help on using the changeset viewer.