Changeset 1908 for trunk/Clp


Ignore:
Timestamp:
Jan 26, 2013 6:20:28 PM (7 years ago)
Author:
stefan
Message:

assume latest cbc, i.e., assume that CBC_AFTER_2_8 gets always defined

File:
1 edited

Legend:

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

    r1906 r1908  
    1313
    1414#ifdef COIN_HAS_CBC
    15 #if CBC_VERSION_MAJOR>2
    16 #define CBC_AFTER_2_8
    17 #elif CBC_VERSION_MAJOR==2
    18 #if CBC_VERSION_MINOR>8
    19 #define CBC_AFTER_2_8
    20 #endif
    21 #endif
    2215#ifdef COIN_HAS_CLP
    2316#include "OsiClpSolverInterface.hpp"
     
    935928               break;
    936929#endif
    937 #ifdef CBC_AFTER_2_8
    938930          case CBC_PARAM_INT_RANDOMSEED:
    939931               oldValue = model.getRandomSeed();
    940932               model.setRandomSeed(value);
    941933               break;
    942 #endif
    943934#endif
    944935          default:
     
    991982          value = model.getNumberThreads();
    992983#endif
    993 #ifdef CBC_AFTER_2_8
    994984     case CBC_PARAM_INT_RANDOMSEED:
    995985          value = model.getRandomSeed();
    996986          break;
    997 #endif
    998987#endif
    999988     default:
     
    20051994     );
    20061995     parameters[numberParameters-1].setIntValue(0);
    2007 #ifdef CBC_AFTER_2_8
    20081996     parameters[numberParameters++] =
    20091997          CbcOrClpParam("expensive!Strong", "Whether to do even more strong branching",
     
    20232011     );
    20242012     parameters[numberParameters-1].setIntValue(0);
    2025 #endif
    20262013#endif
    20272014     parameters[numberParameters++] =
     
    25482535     );
    25492536     parameters[numberParameters-1].setIntValue(0);
    2550 #ifdef CBC_AFTER_2_8
    25512537     parameters[numberParameters++] =
    25522538          CbcOrClpParam("multiple!RootPasses", "Do multiple root passes to collect cuts and solutions",
     
    25632549and Andrea Tramontani)"
    25642550     );
    2565 #endif
    25662551     parameters[numberParameters++] =
    25672552          CbcOrClpParam("naive!Heuristics", "Whether to try some stupid heuristic",
     
    30483033     );
    30493034#ifdef COIN_HAS_CBC
    3050 #ifdef CBC_AFTER_2_8
    30513035     parameters[numberParameters++] =
    30523036          CbcOrClpParam("randomC!bcSeed", "Random seed for Cbc",
     
    30583042     );
    30593043     parameters[numberParameters-1].setIntValue(-1);
    3060 #endif
    30613044     parameters[numberParameters++] =
    30623045          CbcOrClpParam("randomi!zedRounding", "Whether to try randomized rounding heuristic",
Note: See TracChangeset for help on using the changeset viewer.