Changeset 704


Ignore:
Timestamp:
Jan 10, 2006 9:48:37 AM (15 years ago)
Author:
forrest
Message:

add mipoptions

Location:
trunk/Test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Test/CbcOrClpParam.cpp

    r697 r704  
    740740      model.setNumberAnalyzeIterations(value);
    741741      break;
     742    case NUMBERMINI:
     743      oldValue=model.sizeMiniTree();
     744      model.setSizeMiniTree(value);
     745      break;
    742746    default:
    743747      oldValue=0; // to avoid compiler message
     
    771775  case NUMBERANALYZE:
    772776    value=model.numberAnalyzeIterations();
     777    break;
     778  case NUMBERMINI:
     779    value=model.sizeMiniTree();
    773780    break;
    774781  default:
     
    12171224#endif
    12181225  parameters[numberParameters++]=
    1219     CbcOrClpParam("direction","Minimize or Maximize",
    1220                   "min!imize",DIRECTION);
    1221   parameters[numberParameters-1].append("max!imize");
    1222   parameters[numberParameters-1].append("zero");
    1223   parameters[numberParameters-1].setLonghelp
    1224     (
    1225      "The default is minimize - use 'direction maximize' for maximization.\n\
    1226 You can also use the parameters 'maximize' or 'minimize'."
    1227      );
    1228   parameters[numberParameters++]=
    12291226    CbcOrClpParam("directory","Set Default directory for import etc.",
    12301227                  DIRECTORY,299);
     
    15811578#ifdef COIN_USE_CBC
    15821579  parameters[numberParameters++]=
     1580    CbcOrClpParam("mipO!ptions","Dubious options for mip",
     1581                  0,INT_MAX,MIPOPTIONS,false);
     1582  parameters[numberParameters++]=
    15831583    CbcOrClpParam("mixed!IntegerRoundingCuts","Whether to use Mixed Integer Rounding cuts",
    15841584                  "off",MIXEDCUTS);
     
    16021602 you intend to override the behavior of a particular message."
    16031603     );
    1604 #ifdef COIN_USE_CBC
     1604  parameters[numberParameters++]=
     1605    CbcOrClpParam("direction","Minimize or Maximize",
     1606                  "min!imize",DIRECTION);
     1607  parameters[numberParameters-1].append("max!imize");
     1608  parameters[numberParameters-1].append("zero");
     1609  parameters[numberParameters-1].setLonghelp
     1610    (
     1611     "The default is minimize - use 'direction maximize' for maximization.\n\
     1612You can also use the parameters 'maximize' or 'minimize'."
     1613     );
     1614#ifdef COIN_USE_CBC
     1615  parameters[numberParameters++]=
     1616    CbcOrClpParam("miniT!ree","Size of fast mini tree",
     1617                  0,INT_MAX,NUMBERMINI,false);
     1618  parameters[numberParameters-1].setLonghelp
     1619    (
     1620     "The idea is that I can do a small tree fast. \
     1621This is a first try and will hopefully become more sophisticated."
     1622     );
    16051623  parameters[numberParameters++]=
    16061624    CbcOrClpParam("miplib","Do some of miplib test set",
     
    19982016 is initialized to 'stdout'."
    19992017     );
    2000 #ifdef COIN_USE_CBC
    20012018#ifdef COIN_USE_CLP
     2019#ifdef COIN_USE_CBC
    20022020  parameters[numberParameters++]=
    20032021    CbcOrClpParam("solv!e","Solve problem",
     
    20162034     "If 0 then there should be no output in normal circumstances.  1 is probably the best\
    20172035 value for most uses, while 2 and 3 give more information."
     2036     );
     2037#else
     2038  // allow solve as synonym for dual
     2039  parameters[numberParameters++]=
     2040    CbcOrClpParam("solv!e","Solve problem using dual simplex",
     2041                  BAB);
     2042  parameters[numberParameters-1].setLonghelp
     2043    (
     2044     "Just so can use solve for clp as well as in cbc"
    20182045     );
    20192046#endif
  • trunk/Test/CbcOrClpParam.hpp

    r693 r704  
    5959
    6060    STRONGBRANCHING=151,CUTDEPTH, MAXNODES,NUMBERBEFORE,NUMBERANALYZE,
     61    NUMBERMINI,MIPOPTIONS,
    6162#ifdef COIN_USE_CBC
    6263    LOGLEVEL ,
Note: See TracChangeset for help on using the changeset viewer.