Changeset 2040


Ignore:
Timestamp:
Jul 15, 2014 11:45:34 AM (5 years ago)
Author:
forrest
Message:

add Orbital branching

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r2030 r2040  
    16671667                        "off", CBC_PARAM_STR_CUTOFF_CONSTRAINT);
    16681668     parameters[numberParameters-1].append("on");
     1669     parameters[numberParameters-1].append("variable");
     1670     parameters[numberParameters-1].append("forcevariable");
    16691671     parameters[numberParameters-1].setLonghelp
    16701672     (
     
    16811683     parameters[numberParameters-1].append("singletons");
    16821684     parameters[numberParameters-1].append("nonzero");
     1685     parameters[numberParameters-1].append("general!Force?");
    16831686     parameters[numberParameters-1].setLonghelp
    16841687     (
     
    24872490     parameters[numberParameters-1].append("cleaninstead");
    24882491     parameters[numberParameters-1].append("bothinstead");
     2492     parameters[numberParameters-1].append("onlyaswellroot");
     2493     parameters[numberParameters-1].append("cleanaswellroot");
     2494     parameters[numberParameters-1].append("bothaswellroot");
    24892495     parameters[numberParameters-1].setLonghelp
    24902496     (
     
    28512857#endif
    28522858#ifdef COIN_HAS_CBC
     2859#ifdef COIN_HAS_NTY
     2860     parameters[numberParameters++] =
     2861          CbcOrClpParam("Orbit!alBranching", "Whether to try orbital branching",
     2862                        "off", CBC_PARAM_STR_ORBITAL);
     2863     parameters[numberParameters-1].append("on");
     2864     parameters[numberParameters-1].append("strong");
     2865     //parameters[numberParameters-1].append("select");
     2866     parameters[numberParameters-1].setLonghelp
     2867     (
     2868          "This switches on Orbital branching. \
     2869On just adds orbital, strong tries extra fixing in strong branching");
     2870#endif
    28532871     parameters[numberParameters++] =
    28542872          CbcOrClpParam("outDup!licates", "takes duplicate rows etc out of integer model",
     
    32703288way of using absolute value rather than fraction."
    32713289     );
    3272      parameters[numberParameters++] =
    3273           CbcOrClpParam("readS!tored", "Import stored cuts from file",
     3290#endif
     3291     parameters[numberParameters++] =
     3292          CbcOrClpParam("restoreS!olution", "reads solution from file",
     3293                        CLP_PARAM_ACTION_RESTORESOL);
     3294     parameters[numberParameters-1].setLonghelp
     3295     (
     3296          "This will read a binary solution file from the given file name.  It will use the default\
     3297 directory given by 'directory'.  A name of '$' will use the previous value for the name.  This\
     3298 is initialized to 'solution.file'.  This reads in a file from saveSolution"
     3299     );
     3300#ifdef COIN_HAS_CBC
     3301     parameters[numberParameters++] =
     3302          CbcOrClpParam("readSt!ored", "Import stored cuts from file",
    32743303                        CLP_PARAM_ACTION_STOREDFILE, 3, 0);
    32753304#endif
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1976 r2040  
    219219     CBC_PARAM_STR_CUTOFF_CONSTRAINT,
    220220     CBC_PARAM_STR_DW,
     221     CBC_PARAM_STR_ORBITAL,
    221222
    222223     CLP_PARAM_ACTION_DIRECTORY = 301,
     
    269270     CLP_PARAM_ACTION_PARAMETRICS,
    270271     CLP_PARAM_ACTION_GMPL_SOLUTION,
    271 
    272      CBC_PARAM_ACTION_BAB = 351,
     272     CLP_PARAM_ACTION_RESTORESOL,
     273
     274     CBC_PARAM_ACTION_BAB = 361,
    273275     CBC_PARAM_ACTION_MIPLIB,
    274276     CBC_PARAM_ACTION_STRENGTHEN,
     
    517519int whichParam (CbcOrClpParameterType name,
    518520                int numberParameters, CbcOrClpParam *const parameters);
    519 // Dump a solution to file
     521// Dump/restore a solution to file
    520522void saveSolution(const ClpSimplex * lpSolver, std::string fileName);
     523void restoreSolution(ClpSimplex * lpSolver, std::string fileName, int mode);
    521524#endif  /* CbcOrClpParam_H */
Note: See TracChangeset for help on using the changeset viewer.