Changeset 1862 for trunk


Ignore:
Timestamp:
Jun 8, 2012 11:09:20 AM (7 years ago)
Author:
forrest
Message:

keep parametrics flexible for advanced users

File:
1 edited

Legend:

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

    r1861 r1862  
    29752975    lower+=startingTheta*chgLower;
    29762976    upper+=startingTheta*chgUpper;
     2977#ifndef CLP_USER_DRIVEN
    29772978    if (lower > upper) {
    29782979      maxTheta = -1.0;
    29792980      break;
    29802981    }
     2982#endif
    29812983    rowLower_[iRow]=lower;
    29822984    rowUpper_[iRow]=upper;
     
    30003002    lower+=startingTheta*chgLower;
    30013003    upper+=startingTheta*chgUpper;
     3004#ifndef CLP_USER_DRIVEN
    30023005    if (lower > upper) {
    30033006      maxTheta = -1.0;
    30043007      break;
    30053008    }
     3009#endif
    30063010    columnLower_[iColumn]=lower;
    30073011    columnUpper_[iColumn]=upper;
     
    30103014    maxTheta = COIN_DBL_MAX;
    30113015  int returnCode=0;
     3016  /*
     3017    If user is in charge then they are sophisticated enough
     3018    to know what they are doing.  They must be doing something clever
     3019    with event handlers!
     3020   */
     3021#ifndef CLP_USER_DRIVEN
    30123022  if (maxTheta < 0.0) {
    30133023    // bad ranges or initial
     
    30263036    returnCode = -2;
    30273037  }
    3028 #ifdef CLP_USER_DRIVEN
     3038  paramData.maxTheta=CoinMin(maxTheta,endingTheta);
     3039#else
    30293040  // accept user's version
    30303041  paramData.maxTheta=endingTheta;
    3031 #else
    3032   paramData.maxTheta=CoinMin(maxTheta,endingTheta);
    30333042#endif
    30343043  /* given largest change element choose acceptable end
Note: See TracChangeset for help on using the changeset viewer.