Changeset 820


Ignore:
Timestamp:
Jun 18, 2006 11:08:10 AM (14 years ago)
Author:
forrest
Message:

fixes

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r800 r820  
    1818#endif
    1919#ifdef COIN_HAS_CLP
    20 #ifndef COIN_HAS_CLP
    21 #define COIN_HAS_CLP
    22 #endif
    23 #endif
    24 #ifdef COIN_HAS_CLP
    2520#include "ClpSimplex.hpp"
    2621#include "ClpFactorization.hpp"
     
    3025#include <readline/history.h>
    3126#endif
    32 #ifdef COIN_HAS_OSICLP
     27#ifdef COIN_HAS_CBC
    3328// from CoinSolve
    3429static char coin_prompt[]="Coin:";
     
    606601CbcOrClpParam::doubleParameter (OsiSolverInterface * model) const
    607602{
    608   double value;
     603  double value=0.0;
    609604  switch(type_) {
    610605  case DUALTOLERANCE:
     
    18431838  parameters[numberParameters-1].setDoubleValue(1.0);
    18441839#endif
    1845 #ifdef COIN_USE_CBC
     1840#ifdef COIN_HAS_CBC
    18461841  parameters[numberParameters++]=
    18471842    CbcOrClpParam("outDup!licates","takes duplicate rows etc out of integer model",
     
    24042399Look for USERCLP in main driver and modify sample code."
    24052400     );
    2406 #ifdef COIN_USE_CBC
     2401#ifdef COIN_HAS_CBC
    24072402  parameters[numberParameters++]=
    24082403    CbcOrClpParam("userCbc","Hand coded Cbc stuff",
  • trunk/Clp/src/ClpSimplexDual.cpp

    r809 r820  
    27542754          spare2 = array[1-iFlip];
    27552755          index2 = indices[1-iFlip];
    2756      
    27572756          for (i=0;i<interesting[iFlip];i++) {
    27582757            int iSequence=index[i];
     
    27662765                if (-alpha>=acceptablePivot) {
    27672766                  upperTheta = (oldValue-newTolerance)/alpha;
    2768                   // recompute value and make sure works
    2769                   value = oldValue-upperTheta*alpha;
    2770                   if (value<0)
    2771                     upperTheta *= 1.0 +1.0e-11; // must be large
    27722767                }
    27732768              }
     
    27772772                if (alpha>=acceptablePivot) {
    27782773                  upperTheta = (oldValue+newTolerance)/alpha;
    2779                   // recompute value and make sure works
    2780                   value = oldValue-upperTheta*alpha;
    2781                   if (value>0)
    2782                     upperTheta *= 1.0 +1.0e-11; // must be large
    27832774                }
    27842775              }
     
    27982789          badSumPivots=false;
    27992790#endif
     2791          // Make sure upperTheta will work (-O2 and above gives problems)
     2792          upperTheta *= 1.0000000001;
    28002793          for (i=0;i<interesting[iFlip];i++) {
    28012794            int iSequence=index[i];
Note: See TracChangeset for help on using the changeset viewer.