Changeset 2175 for stable

Timestamp:

Oct 6, 2015 4:56:43 AM (4 years ago)

Author:

forrest

Message:

more flushing

Location:

stable/1.16/Clp/src

Files:

• CbcOrClpParam.cpp (modified) (6 diffs)
• CbcOrClpParam.hpp (modified) (1 diff)

stable/1.16/Clp/src/CbcOrClpParam.cpp

@@ -54 +54 @@
 #undef COIN_INT_MAX
 #define COIN_INT_MAX 2147483647
+#endif
+#if FLUSH_PRINT_BUFFER > 2
+int coinFlushBufferFlag=0;
 #endif
 void setCbcOrClpPrinting(bool yesNo)
@@ -1089 +1092 @@
      if (action >= 0)
           currentKeyWord_ = action;
+#if FLUSH_PRINT_BUFFER > 2
+     if (name_=="bufferedMode")
+       coinFlushBufferFlag=action;
+#endif
 }
 // Sets current parameter option
@@ -1099 +1106 @@
                     << definedKeyWords_[value] << std::endl;
 
+#if FLUSH_PRINT_BUFFER > 2
+     if (name_=="bufferedMode")
+       coinFlushBufferFlag=value;
+#endif
      currentKeyWord_ = value;
 }
@@ -1122 +1133 @@
          sprintf(printArray, "Option for %s changed from %s to %s",
                  name_.c_str(), current, newString);
+#if FLUSH_PRINT_BUFFER > 2
+         if (name_=="bufferedMode")
+           coinFlushBufferFlag=value;
+#endif
          currentKeyWord_ = value;
      } else {
@@ -1136 +1151 @@
      printArray[0] = '\0';
      if (action >= 0) {
+#if FLUSH_PRINT_BUFFER > 2
+       if (name_=="bufferedMode")
+         coinFlushBufferFlag=action;
+#endif
          if (action == currentKeyWord_)
            return NULL;
@@ -1648 +1667 @@
      parameters[numberParameters-1].append("off2");
      parameters[numberParameters-1].append("on2");
+#if FLUSH_PRINT_BUFFER > 2
+     parameters[numberParameters++] =
+          CbcOrClpParam("buff!eredMode", "Whether to flush print buffer",
+                        "on", CLP_PARAM_STR_BUFFER_MODE);
+     parameters[numberParameters-1].append("off");
+     parameters[numberParameters-1].setLonghelp
+     (
+          "Default is on, off switches on unbuffered output"
+     );
+     parameters[numberParameters-1].setIntValue(0);
+#endif
      parameters[numberParameters++] =
           CbcOrClpParam("chol!esky", "Which cholesky algorithm",

stable/1.16/Clp/src/CbcOrClpParam.hpp

@@ -171 +171 @@
      CLP_PARAM_STR_TIME_MODE,
      CLP_PARAM_STR_ABCWANTED,
+     CLP_PARAM_STR_BUFFER_MODE,
 
      CBC_PARAM_STR_NODESTRATEGY = 251,