Changeset 1712

Timestamp:

Mar 26, 2011 11:12:11 AM (9 years ago)

Author:

tkr

Message:

Merging r1711 from trunk

Location:

stable/1.13/Clp

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/CbcOrClpParam.cpp (modified) (1 diff)
• src/CbcOrClpParam.hpp (modified) (1 diff)

stable/1.13/Clp/src/CbcOrClpParam.cpp

@@ -3159 +3159 @@
                         CLP_PARAM_ACTION_TIGHTEN, 7, 0);
 #endif
+     parameters[numberParameters++] =
+          CbcOrClpParam("timeM!ode", "Whether to use CPU or elapsed time",
+                        "cpu", CLP_PARAM_STR_TIME_MODE);
+     parameters[numberParameters-1].append("elapsed");
+     parameters[numberParameters-1].setLonghelp
+     (
+          "cpu uses CPU time for stopping, while elapsed uses elapsed time. \
+(On Windows, elapsed time is always used)."
+     );
 #ifdef COIN_HAS_CBC
      parameters[numberParameters++] =

stable/1.13/Clp/src/CbcOrClpParam.hpp

@@ -156 +156 @@
      CLP_PARAM_STR_FACTORIZATION,
      CLP_PARAM_STR_ALLCOMMANDS,
+     CLP_PARAM_STR_TIME_MODE,
 
      CBC_PARAM_STR_NODESTRATEGY = 251,