Changeset 1712


Ignore:
Timestamp:
Mar 26, 2011 11:12:11 AM (9 years ago)
Author:
tkr
Message:

Merging r1711 from trunk

Location:
stable/1.13/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.13/Clp

  • stable/1.13/Clp/src

  • stable/1.13/Clp/src/CbcOrClpParam.cpp

    r1605 r1712  
    31593159                        CLP_PARAM_ACTION_TIGHTEN, 7, 0);
    31603160#endif
     3161     parameters[numberParameters++] =
     3162          CbcOrClpParam("timeM!ode", "Whether to use CPU or elapsed time",
     3163                        "cpu", CLP_PARAM_STR_TIME_MODE);
     3164     parameters[numberParameters-1].append("elapsed");
     3165     parameters[numberParameters-1].setLonghelp
     3166     (
     3167          "cpu uses CPU time for stopping, while elapsed uses elapsed time. \
     3168(On Windows, elapsed time is always used)."
     3169     );
    31613170#ifdef COIN_HAS_CBC
    31623171     parameters[numberParameters++] =
  • stable/1.13/Clp/src/CbcOrClpParam.hpp

    r1525 r1712  
    156156     CLP_PARAM_STR_FACTORIZATION,
    157157     CLP_PARAM_STR_ALLCOMMANDS,
     158     CLP_PARAM_STR_TIME_MODE,
    158159
    159160     CBC_PARAM_STR_NODESTRATEGY = 251,
Note: See TracChangeset for help on using the changeset viewer.