Changeset 1906


Ignore:
Timestamp:
Jan 16, 2013 9:47:02 AM (7 years ago)
Author:
forrest
Message:

more options

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1904 r1906  
    674674     case CBC_PARAM_INT_THREADS:
    675675          value = model->numberThreads();
     676          break;
    676677#endif
    677678#endif
     
    934935               break;
    935936#endif
     937#ifdef CBC_AFTER_2_8
     938          case CBC_PARAM_INT_RANDOMSEED:
     939               oldValue = model.getRandomSeed();
     940               model.setRandomSeed(value);
     941               break;
     942#endif
    936943#endif
    937944          default:
     
    983990     case CBC_PARAM_INT_THREADS:
    984991          value = model.getNumberThreads();
     992#endif
     993#ifdef CBC_AFTER_2_8
     994     case CBC_PARAM_INT_RANDOMSEED:
     995          value = model.getRandomSeed();
     996          break;
    985997#endif
    986998#endif
     
    19851997#ifdef COIN_HAS_CBC
    19861998     parameters[numberParameters++] =
    1987           CbcOrClpParam("exp!eriment", "Whether to use testing features",
     1999          CbcOrClpParam("exper!iment", "Whether to use testing features",
    19882000                        -1, 200, CBC_PARAM_INT_EXPERIMENT, 0);
    19892001     parameters[numberParameters-1].setLonghelp
     
    19932005     );
    19942006     parameters[numberParameters-1].setIntValue(0);
     2007#ifdef CBC_AFTER_2_8
     2008     parameters[numberParameters++] =
     2009          CbcOrClpParam("expensive!Strong", "Whether to do even more strong branching",
     2010                        0, COIN_INT_MAX, CBC_PARAM_INT_STRONG_STRATEGY, 0);
     2011     parameters[numberParameters-1].setLonghelp
     2012     (
     2013      "Strategy for extra strong branching \n\
     2014\t0 - normal\n\
     2015\twhen to do all fractional\n\
     2016\t1 - root node\n\
     2017\t2 - depth less than modifier\n\
     2018\t4 - if objective == best possible\n\
     2019\t6 - as 2+4\n\
     2020\twhen to do all including satisfied\n\
     2021\t10 - root node etc.\n\
     2022\tIf >=100 then do when depth <= strategy/100 (otherwise 5)"
     2023     );
     2024     parameters[numberParameters-1].setIntValue(0);
     2025#endif
    19952026#endif
    19962027     parameters[numberParameters++] =
     
    30173048     );
    30183049#ifdef COIN_HAS_CBC
     3050#ifdef CBC_AFTER_2_8
     3051     parameters[numberParameters++] =
     3052          CbcOrClpParam("randomC!bcSeed", "Random seed for Cbc",
     3053                        -1, COIN_INT_MAX, CBC_PARAM_INT_RANDOMSEED);
     3054     parameters[numberParameters-1].setLonghelp
     3055     (
     3056          "This sets a random seed for Cbc \
     3057- 0 says use time of day, -1 is as now."
     3058     );
     3059     parameters[numberParameters-1].setIntValue(-1);
     3060#endif
    30193061     parameters[numberParameters++] =
    30203062          CbcOrClpParam("randomi!zedRounding", "Whether to try randomized rounding heuristic",
     
    33583400     parameters[numberParameters++] =
    33593401          CbcOrClpParam("strong!Branching", "Number of variables to look at in strong branching",
    3360                         0, 999999, CBC_PARAM_INT_STRONGBRANCHING);
     3402                        0, COIN_INT_MAX, CBC_PARAM_INT_STRONGBRANCHING);
    33613403     parameters[numberParameters-1].setLonghelp
    33623404     (
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1904 r1906  
    139139     CBC_PARAM_INT_RANDOMSEED,
    140140     CBC_PARAM_INT_MULTIPLEROOTS,
     141     CBC_PARAM_INT_STRONG_STRATEGY,
    141142
    142143     CLP_PARAM_STR_DIRECTION = 201,
Note: See TracChangeset for help on using the changeset viewer.