Changeset 1712
- Timestamp:
- Mar 26, 2011 11:12:11 AM (10 years ago)
- Location:
- stable/1.13/Clp
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/1.13/Clp
- Property svn:mergeinfo changed
/trunk/Clp merged: 1711
- Property svn:mergeinfo changed
-
stable/1.13/Clp/src
- Property svn:mergeinfo changed
/trunk/Clp/src merged: 1711
- Property svn:mergeinfo changed
-
stable/1.13/Clp/src/CbcOrClpParam.cpp
r1605 r1712 3159 3159 CLP_PARAM_ACTION_TIGHTEN, 7, 0); 3160 3160 #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 ); 3161 3170 #ifdef COIN_HAS_CBC 3162 3171 parameters[numberParameters++] = -
stable/1.13/Clp/src/CbcOrClpParam.hpp
r1525 r1712 156 156 CLP_PARAM_STR_FACTORIZATION, 157 157 CLP_PARAM_STR_ALLCOMMANDS, 158 CLP_PARAM_STR_TIME_MODE, 158 159 159 160 CBC_PARAM_STR_NODESTRATEGY = 251,
Note: See TracChangeset
for help on using the changeset viewer.