Changeset 1850


Ignore:
Timestamp:
Mar 2, 2012 7:42:43 AM (8 years ago)
Author:
stefan
Message:

merge chgset 1849 from stable/1.14

Location:
trunk/Clp
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp

  • trunk/Clp/src

  • trunk/Clp/src/CbcOrClpParam.cpp

    r1829 r1850  
    869869               model.setIntParam(CbcModel::CbcMaxNumSol, value);
    870870               break;
     871          case CBC_PARAM_INT_MAXSAVEDSOLS:
     872               oldValue = model.maximumSavedSolutions();
     873               model.setMaximumSavedSolutions(value);
     874               break;
    871875          case CBC_PARAM_INT_STRONGBRANCHING:
    872876               oldValue = model.numberStrong();
     
    923927          value = model.getIntParam(CbcModel::CbcMaxNumSol);
    924928          break;
     929     case CBC_PARAM_INT_MAXSAVEDSOLS:
     930          value = model.maximumSavedSolutions();
     931          break;
    925932     case CBC_PARAM_INT_STRONGBRANCHING:
    926933          value = model.numberStrong();
     
    23262333     );
    23272334     parameters[numberParameters++] =
    2328           CbcOrClpParam("maxS!olutions", "Maximum number of solutions to get",
     2335          CbcOrClpParam("maxSaved!Solutions", "Maximum number of solutions to save",
     2336                        0, 2147483647, CBC_PARAM_INT_MAXSAVEDSOLS);
     2337     parameters[numberParameters-1].setLonghelp
     2338     (
     2339          "Number of solutions to save."
     2340     );
     2341     parameters[numberParameters++] =
     2342          CbcOrClpParam("maxSo!lutions", "Maximum number of solutions to get",
    23292343                        1, 2147483647, CBC_PARAM_INT_MAXSOLS);
    23302344     parameters[numberParameters-1].setLonghelp
     
    24592473     );
    24602474#ifdef COIN_HAS_CBC
     2475     parameters[numberParameters++] =
     2476          CbcOrClpParam("nextB!estSolution", "Prints next best saved solution to file",
     2477                        CLP_PARAM_ACTION_NEXTBESTSOLUTION);
     2478     parameters[numberParameters-1].setLonghelp
     2479     (
     2480          "To write best solution, just use solution.  This prints next best (if exists) \
     2481 and then deletes it. \
     2482 This will write a primitive solution file to the given file name.  It will use the default\
     2483 directory given by 'directory'.  A name of '$' will use the previous value for the name.  This\
     2484 is initialized to 'stdout'.  The amount of output can be varied using printi!ngOptions or printMask."
     2485     );
    24612486     parameters[numberParameters++] =
    24622487          CbcOrClpParam("node!Strategy", "What strategy to use to select nodes",
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1732 r1850  
    134134     CLP_PARAM_INT_LOGLEVEL ,
    135135#endif
     136     CBC_PARAM_INT_MAXSAVEDSOLS,
    136137
    137138     CLP_PARAM_STR_DIRECTION = 201,
     
    259260     CBC_PARAM_ACTION_USERCBC,
    260261     CBC_PARAM_ACTION_DOHEURISTIC,
     262     CLP_PARAM_ACTION_NEXTBESTSOLUTION,
    261263
    262264     CBC_PARAM_NOTUSED_OSLSTUFF = 401,
  • trunk/Clp/src/OsiClp

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.