Changeset 1904


Ignore:
Timestamp:
Jan 10, 2013 8:47:59 AM (7 years ago)
Author:
forrest
Message:

for multiple root solvers

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1899 r1904  
    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"
     
    24462453 you intend to override the behavior of a particular message.  This only affects Clp not Cbc."
    24472454     );
     2455     parameters[numberParameters++] =
     2456          CbcOrClpParam("miplib", "Do some of miplib test set",
     2457                        CBC_PARAM_ACTION_MIPLIB, 3, 1);
    24482458#ifdef COIN_HAS_CBC
    24492459      parameters[numberParameters++] =
     
    25072517     );
    25082518     parameters[numberParameters-1].setIntValue(0);
    2509      parameters[numberParameters++] =
    2510           CbcOrClpParam("miplib", "Do some of miplib test set",
    2511                         CBC_PARAM_ACTION_MIPLIB, 3, 1);
     2519#ifdef CBC_AFTER_2_8
     2520     parameters[numberParameters++] =
     2521          CbcOrClpParam("multiple!RootPasses", "Do multiple root passes to collect cuts and solutions",
     2522                        0, 100000000, CBC_PARAM_INT_MULTIPLEROOTS, 0);
     2523     parameters[numberParameters-1].setIntValue(0);
     2524     parameters[numberParameters-1].setLonghelp
     2525     (
     2526          "Do (in parallel if threads enabled) the root phase this number of times \
     2527 and collect all solutions and cuts generated.  The actual format is aabbcc \
     2528where aa is non-zero to say just do heuristics - no cuts, if bb is non zero \
     2529then it is number of threads to use (otherwise uses threads setting) and \
     2530cc is number of times to do root phase.  Yet another one from the Italian idea factory \
     2531(This time - Andrea Lodi , Matteo Fischetti , Michele Monaci , Domenico Salvagnin , \
     2532and Andrea Tramontani)"
     2533     );
     2534#endif
    25122535     parameters[numberParameters++] =
    25132536          CbcOrClpParam("naive!Heuristics", "Whether to try some stupid heuristic",
     
    35103533     (
    35113534          "This switches on zero-half cuts (either at root or in entire tree) \
    3512 See branchAndCut for information on options."
     3535See branchAndCut for information on options.  This implementation was written by \
     3536Alberto Caprara."
    35133537     );
    35143538#endif
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1892 r1904  
    137137#endif
    138138     CBC_PARAM_INT_MAXSAVEDSOLS,
     139     CBC_PARAM_INT_RANDOMSEED,
     140     CBC_PARAM_INT_MULTIPLEROOTS,
    139141
    140142     CLP_PARAM_STR_DIRECTION = 201,
     
    478480void CoinReadPrintit(const char * input);
    479481void setCbcOrClpPrinting(bool yesNo);
    480 #define CBCMAXPARAMETERS 200
     482#define CBCMAXPARAMETERS 250
    481483/*
    482484  Subroutine to establish the cbc parameter array. See the description of
Note: See TracChangeset for help on using the changeset viewer.