Changeset 933 for branches


Ignore:
Timestamp:
Feb 28, 2007 11:45:24 AM (13 years ago)
Author:
forrest
Message:

minor stuff

Location:
branches/devel/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Clp/src/Idiot.cpp

    r854 r933  
    121121  }
    122122  sum /= (double) (nnzero+1);
    123   maxIts_=2;
     123  if (maxIts_==5)
     124    maxIts_=2;
    124125  if (numberPass<=0)
    125126    // Cast to double to avoid VACPP complaining
     
    130131  if (mu_==1e-4)
    131132    mu_= CoinMax(1.0e-3,sum*1.0e-5);
    132   if (!lightWeight_) {
    133     maxIts2_=105;
    134   } else if (lightWeight_==1) {
    135     mu_ *= 1000.0;
    136     maxIts2_=23;
    137   } else if (lightWeight_==2) {
    138     maxIts2_=11;
    139   } else {
    140     maxIts2_=23;
     133  if (maxIts2_==100) {
     134    if (!lightWeight_) {
     135      maxIts2_=105;
     136    } else if (lightWeight_==1) {
     137      mu_ *= 1000.0;
     138      maxIts2_=23;
     139    } else if (lightWeight_==2) {
     140      maxIts2_=11;
     141    } else {
     142      maxIts2_=23;
     143    }
    141144  }
    142145  //printf("setting mu to %g and doing %d passes\n",mu_,majorIterations_);
  • branches/devel/Clp/src/Idiot.hpp

    r754 r933  
    136136  inline void setMinorIterations(int value)
    137137  { maxIts2_ = value;};
     138  // minor iterations for first time
     139  inline int getMinorIterations0() const
     140  { return maxIts_;};
     141  inline void setMinorIterations0(int value)
     142  { maxIts_ = value;};
    138143  /** Reduce weight after this many major iterations.  It may
    139144      get reduced before this but this is a maximum.
Note: See TracChangeset for help on using the changeset viewer.