Changeset 1015


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

to try and help with trunk branches mess

Location:
trunk/Clp/src
Files:
4 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];
  • trunk/Clp/src/ClpParameters.hpp

    r754 r1015  
    1515      terminating */
    1616  ClpMaxNumIterationHotStart,
     17  /** The name discipline; specifies how the solver will handle row and
     18      column names.
     19    - 0: Auto names: Names cannot be set by the client. Names of the form
     20         Rnnnnnnn or Cnnnnnnn are generated on demand when a name for a
     21         specific row or column is requested; nnnnnnn is derived from the row
     22         or column index. Requests for a vector of names return a vector with
     23         zero entries.
     24    - 1: Lazy names: Names supplied by the client are retained. Names of the
     25         form Rnnnnnnn or Cnnnnnnn are generated on demand if no name has been
     26         supplied by the client. Requests for a vector of names return a
     27         vector sized to the largest index of a name supplied by the client;
     28         some entries in the vector may be null strings.
     29    - 2: Full names: Names supplied by the client are retained. Names of the
     30         form Rnnnnnnn or Cnnnnnnn are generated on demand if no name has been
     31         supplied by the client. Requests for a vector of names return a
     32         vector sized to match the constraint system, and all entries will
     33         contain either the name specified by the client or a generated name.
     34  */
     35  ClpNameDiscipline,
    1736  /** Just a marker, so that we can allocate a static sized array to store
    1837      parameters. */
  • trunk/Clp/src/ClpSimplex.hpp

    r912 r1015  
    3030class OsiClpSolverInterface;
    3131class CoinWarmStartBasis;
     32class ClpDisasterHandler;
    3233
    3334/** This solves LPs using the simplex method
     
    489490  inline void setNumberDualInfeasibilities(int value)
    490491          { numberDualInfeasibilities_=value;} ;
     492  /// Number of dual infeasibilities (without free)
     493  inline int numberDualInfeasibilitiesWithoutFree() const
     494          { return numberDualInfeasibilitiesWithoutFree_;} ;
    491495  /// Sum of primal infeasibilities
    492496  inline double sumPrimalInfeasibilities() const
  • trunk/Clp/src/Idiot.cpp

    r754 r1015  
    711711    }
    712712  }
     713#if 0
    713714  if ((logLevel&1)==0) {
    714715    printf(
     
    716717            iteration,mu,lastResult.infeas,lastResult.objval,n);
    717718  }
     719#endif
    718720#ifndef OSI_IDIOT
    719721  model_->setSumPrimalInfeasibilities(lastResult.infeas);
Note: See TracChangeset for help on using the changeset viewer.