Changeset 2176 for trunk


Ignore:
Timestamp:
Oct 6, 2015 5:06:28 AM (3 years ago)
Author:
forrest
Message:

more flushing

Location:
trunk/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/CbcOrClpParam.cpp

    r2149 r2176  
    5454#undef COIN_INT_MAX
    5555#define COIN_INT_MAX 2147483647
     56#endif
     57#if FLUSH_PRINT_BUFFER > 2
     58int coinFlushBufferFlag=0;
    5659#endif
    5760void setCbcOrClpPrinting(bool yesNo)
     
    10891092     if (action >= 0)
    10901093          currentKeyWord_ = action;
     1094#if FLUSH_PRINT_BUFFER > 2
     1095     if (name_=="bufferedMode")
     1096       coinFlushBufferFlag=action;
     1097#endif
    10911098}
    10921099// Sets current parameter option
     
    10991106                    << definedKeyWords_[value] << std::endl;
    11001107
     1108#if FLUSH_PRINT_BUFFER > 2
     1109     if (name_=="bufferedMode")
     1110       coinFlushBufferFlag=value;
     1111#endif
    11011112     currentKeyWord_ = value;
    11021113}
     
    11221133         sprintf(printArray, "Option for %s changed from %s to %s",
    11231134                 name_.c_str(), current, newString);
     1135#if FLUSH_PRINT_BUFFER > 2
     1136         if (name_=="bufferedMode")
     1137           coinFlushBufferFlag=value;
     1138#endif
    11241139         currentKeyWord_ = value;
    11251140     } else {
     
    11361151     printArray[0] = '\0';
    11371152     if (action >= 0) {
     1153#if FLUSH_PRINT_BUFFER > 2
     1154       if (name_=="bufferedMode")
     1155         coinFlushBufferFlag=action;
     1156#endif
    11381157         if (action == currentKeyWord_)
    11391158           return NULL;
     
    16481667     parameters[numberParameters-1].append("off2");
    16491668     parameters[numberParameters-1].append("on2");
     1669#if FLUSH_PRINT_BUFFER > 2
     1670     parameters[numberParameters++] =
     1671          CbcOrClpParam("buff!eredMode", "Whether to flush print buffer",
     1672                        "on", CLP_PARAM_STR_BUFFER_MODE);
     1673     parameters[numberParameters-1].append("off");
     1674     parameters[numberParameters-1].setLonghelp
     1675     (
     1676          "Default is on, off switches on unbuffered output"
     1677     );
     1678     parameters[numberParameters-1].setIntValue(0);
     1679#endif
    16501680     parameters[numberParameters++] =
    16511681          CbcOrClpParam("chol!esky", "Which cholesky algorithm",
  • trunk/Clp/src/CbcOrClpParam.hpp

    r2149 r2176  
    172172     CLP_PARAM_STR_TIME_MODE,
    173173     CLP_PARAM_STR_ABCWANTED,
     174     CLP_PARAM_STR_BUFFER_MODE,
    174175
    175176     CBC_PARAM_STR_NODESTRATEGY = 251,
Note: See TracChangeset for help on using the changeset viewer.