Changeset 1905


Ignore:
Timestamp:
Jan 10, 2013 11:14:36 AM (7 years ago)
Author:
forrest
Message:

put multiple root solvers into stable (only on if >Cbc2.8)

Location:
stable/1.14/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14/Clp/src/CbcOrClpParam.cpp

    r1898 r1905  
    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
    1522#ifdef COIN_HAS_CLP
    1623#include "OsiClpSolverInterface.hpp"
     
    24902497          CbcOrClpParam("miplib", "Do some of miplib test set",
    24912498                        CBC_PARAM_ACTION_MIPLIB, 3, 1);
     2499#ifdef CBC_AFTER_2_8
     2500     parameters[numberParameters++] =
     2501          CbcOrClpParam("multiple!RootPasses", "Do multiple root passes to collect cuts and solutions",
     2502                        0, 100000000, CBC_PARAM_INT_MULTIPLEROOTS, 0);
     2503     parameters[numberParameters-1].setIntValue(0);
     2504     parameters[numberParameters-1].setLonghelp
     2505     (
     2506          "Do (in parallel if threads enabled) the root phase this number of times \
     2507 and collect all solutions and cuts generated.  The actual format is aabbcc \
     2508where aa is non-zero to say just do heuristics - no cuts, if bb is non zero \
     2509then it is number of threads to use (otherwise uses threads setting) and \
     2510cc is number of times to do root phase.  Yet another one from the Italian idea factory \
     2511(Andrea Lodi , Matteo Fischetti , Michele Monaci , Domenico Salvagnin , and Andrea Tramontani3)"
     2512     );
     2513#endif
    24922514     parameters[numberParameters++] =
    24932515          CbcOrClpParam("naive!Heuristics", "Whether to try some stupid heuristic",
     
    35003522     (
    35013523          "This switches on zero-half cuts (either at root or in entire tree) \
    3502 See branchAndCut for information on options."
     3524See branchAndCut for information on options.  This implementation was written by \
     3525Alberto Caprara."
    35033526     );
    35043527#endif
  • stable/1.14/Clp/src/CbcOrClpParam.hpp

    r1893 r1905  
    138138     CBC_PARAM_INT_MAXSAVEDSOLS,
    139139     CBC_PARAM_INT_RANDOMSEED,
     140     CBC_PARAM_INT_MULTIPLEROOTS,
    140141
    141142     CLP_PARAM_STR_DIRECTION = 201,
Note: See TracChangeset for help on using the changeset viewer.