add precisionoutput parameter

Author: jjhforrest

src/CbcParam.hpp

@@ -120,6 +120,7 @@ class CBCLIB_EXPORT CbcParam : public CoinParam {
       // String Parameters
       FIRSTSTRINGPARAM,
       PRINTMASK,
+      OUTPUTPRECISION,
       LASTSTRINGPARAM,
 
       // Cut Parameters

src/CbcParamUtils.hpp

@@ -30,6 +30,7 @@ int doExitParam(CoinParam &param);
 int doHelpParam(CoinParam &param);
 int doImportParam(CoinParam &param);
 int doPrintMaskParam(CoinParam &param);
+int doOutputPrecisionParam(CoinParam &param);
 int doNothingParam(CoinParam &param);
 int doSolutionParam(CoinParam &param);
 int doUnimplementedParam(CoinParam &param);

src/CbcParameters.cpp

@@ -65,6 +65,11 @@ void CbcParameters::init(int strategy){
   lastSolnOut_ = "stdout";
   printMode_ = 0;
   printMask_ = "";
+#ifndef CLP_OUTPUT_FORMAT
+  outputPrecision_ = "%15.8g";
+#else
+  outputPrecision_ = "CLP_OUTPUT_FORMAT";
+#endif
   noPrinting_ = false;
   printWelcome_ = true;
   useSignalHandler_ = false;
@@ -358,6 +363,7 @@ void CbcParameters::setDefaults(int strategy) {
   parameters_[CbcParam::MODELFILE]->setDefault(std::string("prob.mod"));
   parameters_[CbcParam::NEXTSOLFILE]->setDefault(std::string("next.sol"));
   parameters_[CbcParam::PRINTMASK]->setDefault("");
+  parameters_[CbcParam::OUTPUTPRECISION]->setDefault("%15.8g");
   parameters_[CbcParam::PRIORITYFILE]->setDefault(std::string("priorities.txt"));
   parameters_[CbcParam::SOLUTIONFILE]->setDefault(std::string("opt.sol"));
   parameters_[CbcParam::SOLUTIONBINARYFILE]->setDefault(std::string("solution.file"));
@@ -1131,8 +1137,14 @@ void CbcParameters::addCbcSolverStrParams() {
       "This is only active if model has names.");
   parameters_[CbcParam::PRINTMASK]->setPushFunc(CbcParamUtils::doPrintMaskParam);
 
+  parameters_[CbcParam::OUTPUTPRECISION]->setup(
+      "precision!Output", "Handle format precision with string print mask",
+      "Precision: %.nf → n digits after decimal; %.ng → n significant digits"
+      "Width: %mw → minimum field width, padded with spaces by default."
+      "Remember the f or g at end as %18.5 by itself gives garbage".
+  );
+  parameters_[CbcParam::OUTPUTPRECISION]->setPushFunc(CbcParamUtils::doOutputPrecisionParam);
 }
-
 //###########################################################################
 //###########################################################################
 

src/CbcParameters.hpp

@@ -1622,6 +1622,13 @@ class CBCLIB_EXPORT CbcParameters {
    inline std::string getPrintMask() { return (printMask_);
   }
 
+ /*! \brief Get output precision */
+ inline std::string getOutputPrecision() { return (outputPrecision_);
+ }
+
+ /*! \brief Set output precision */
+ inline void setOutputPrecision(std::string outputPrecision) { outputPrecision_ = outputPrecision; }
+
   /*! \brief Set print mask */
    inline void setPrintMask(std::string mask) { printMask_ = mask; }
 
@@ -2068,7 +2075,10 @@ class CBCLIB_EXPORT CbcParameters {
       060920.
     */
   std::string printMask_;
-
+  
+  /*! \brief Printing precision */
+  std::string outputPrecision_;
+  
   /*! \brief Disable printing altogether */
   bool noPrinting_;
 

src/CbcSolution.cpp

@@ -575,6 +575,15 @@ int CbcParamUtils::doPrintMaskParam(CoinParam &param)
 
   return (0);
 }
-
-/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
- */
+int CbcParamUtils::doOutputPrecisionParam(CoinParam &param)
+{
+  CbcParam &cbcParam = dynamic_cast<CbcParam &>(param);
+  CbcParameters *parameters = cbcParam.parameters();
+  assert(parameters != 0);
+  
+  std::string outputPrecision = cbcParam.strVal();
+  
+  parameters->setOutputPrecision(outputPrecision);
+  
+  return (0);
+}

src/CbcSolver.cpp

@@ -181,7 +181,7 @@ void printGeneralWarning(CbcModel &model, std::string message, int type)
 #endif
 
 #ifndef CLP_OUTPUT_FORMAT
-#define CLP_OUTPUT_FORMAT % 15.8g
+//char CLP_OUTPUT_FORMAT[32] = "%15.8g";
 #define CLP_INTEGER_OUTPUT_FORMAT % 15ld
 #endif
 
@@ -10292,8 +10292,17 @@ int CbcMain1(std::deque<std::string> inputQueue, CbcModel &model,
                continue;
             }
             break;
-            
-          case CbcParam::WRITEMODEL:{
+	  case CbcParam::OUTPUTPRECISION:
+            if ((status = cbcParam->readValue(inputQueue, field, &message))){
+	      printGeneralMessage(model_, message);
+	      continue;
+            }
+            if (cbcParam->setVal(field, &message)){
+	      printGeneralMessage(model_, message);
+	      continue;
+            }
+	    break;
+	  case CbcParam::WRITEMODEL:{
             cbcParam->readValue(inputQueue, fileName, &message);
             CoinParamUtils::processFile(fileName,
                                  parameters[CbcParam::DIRECTORY]->dirName());
@@ -11165,12 +11174,12 @@ clp watson.mps -\nscaling off\nprimalsimplex");
 
                 char printFormat[50];
                 sprintf(printFormat, " %s         %s\n",
-                        CLP_QUOTE(CLP_OUTPUT_FORMAT),
-                        CLP_QUOTE(CLP_OUTPUT_FORMAT));
+                        parameters[CbcParam::OUTPUTPRECISION]->strVal().c_str(),
+                        parameters[CbcParam::OUTPUTPRECISION]->strVal().c_str());
                 char printIntFormat[50];
                 sprintf(printIntFormat, " %s         %s\n",
                         CLP_QUOTE(CLP_INTEGER_OUTPUT_FORMAT),
-                        CLP_QUOTE(CLP_OUTPUT_FORMAT));
+                        parameters[CbcParam::OUTPUTPRECISION]->strVal().c_str());
                 if (printMode > 2 && printMode < 5) {
                   for (iRow = 0; iRow < numberRows; iRow++) {
                     int type = printMode - 3;