Ignore:
Timestamp:
Nov 15, 2018 11:13:52 AM (5 months ago)
Author:
forrest
Message:

more flexibility for sos - also allow more string parameters

File:
1 edited

Legend:

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

    r2353 r2371  
    175175     CLP_PARAM_STR_BUFFER_MODE,
    176176
    177      CBC_PARAM_STR_NODESTRATEGY = 251,
     177     CBC_PARAM_STR_NODESTRATEGY = 301,
    178178     CBC_PARAM_STR_BRANCHSTRATEGY,
    179179     CBC_PARAM_STR_CUTSSTRATEGY,
     
    225225     CBC_PARAM_STR_ORBITAL,
    226226     CBC_PARAM_STR_PREPROCNAMES,
    227 
    228      CLP_PARAM_ACTION_DIRECTORY = 301,
     227     CBC_PARAM_STR_SOSPRIORITIZE,
     228
     229     CLP_PARAM_ACTION_DIRECTORY = 401,
    229230     CLP_PARAM_ACTION_DIRSAMPLE,
    230231     CLP_PARAM_ACTION_DIRNETLIB,
     
    277278     CLP_PARAM_ACTION_RESTORESOL,
    278279
    279      CBC_PARAM_ACTION_BAB = 361,
     280     CBC_PARAM_ACTION_BAB = 501,
    280281     CBC_PARAM_ACTION_MIPLIB,
    281282     CBC_PARAM_ACTION_STRENGTHEN,
     
    286287     CLP_PARAM_ACTION_NEXTBESTSOLUTION,
    287288
    288      CBC_PARAM_NOTUSED_OSLSTUFF = 401,
     289     CBC_PARAM_NOTUSED_OSLSTUFF = 601,
    289290     CBC_PARAM_NOTUSED_CBCSTUFF,
    290291
Note: See TracChangeset for help on using the changeset viewer.