Changeset 826 for cpp/frams/util

Timestamp:

11/25/18 20:13:18 (5 years ago)

Author:

Maciej Komosinski

Message:

Used the Dragon4 algorithm to print floating point values with full precision instead of "%.17g"

Location:

cpp/frams/util

Files:

• sstring-simple.cpp (modified) (2 diffs)
• sstring.cpp (modified) (2 diffs)

cpp/frams/util/sstring-simple.cpp

@@ -3 +3 @@
 #include "extvalue.h"
 #include <assert.h>
+#ifdef USE_PRINTFLOAT_DRAGON4
+#include <PrintFloat/PrintFloat.h>
+#endif
 
 void SString::initEmpty()
@@ -224 +227 @@
 SString SString::valueOf(double d)
 {
-        SString tmp = SString::sprintf("%.15g", d);
+#ifdef USE_PRINTFLOAT_DRAGON4
+        SString tmp;
+        char* here = tmp.directWrite(30);
+        tmp.endWrite(PrintFloat64(here, 30, d,
+                ((d < -1e17) || (d > 1e17) || ((d < 1e-4) && (d > -1e-4) && (d != 0.0)))
+                ? PrintFloatFormat_Scientific : PrintFloatFormat_Positional,
+                -1));//http://www.ryanjuckett.com/programming/printing-floating-point-numbers/
+#else
+        SString tmp = SString::sprintf("%.17g", d); //https://stackoverflow.com/questions/16839658/printf-width-specifier-to-maintain-precision-of-floating-point-value
+#endif
         if ((!strchr(tmp.c_str(), '.')) && (!strchr(tmp.c_str(), 'e'))) tmp += ".0";
         return tmp;

cpp/frams/util/sstring.cpp

@@ -23 +23 @@
 #include "extvalue.h"
 #include <assert.h>
+#ifdef USE_PRINTFLOAT_DRAGON4
+#include <PrintFloat/PrintFloat.h>
+#endif
 
 #ifdef MULTITHREADED
@@ -363 +366 @@
 SString SString::valueOf(double d)
 {
-        SString tmp = SString::sprintf("%.15g", d);
+#ifdef USE_PRINTFLOAT_DRAGON4
+        SString tmp;
+        char* here=tmp.directWrite(30);
+        tmp.endWrite(PrintFloat64(here,30,d,
+                                  ((d<-1e17)||(d>1e17)||((d<1e-4)&&(d>-1e-4)&&(d!=0.0)))
+                                  ? PrintFloatFormat_Scientific : PrintFloatFormat_Positional,
+                                  -1));//http://www.ryanjuckett.com/programming/printing-floating-point-numbers/
+#else
+        SString tmp = SString::sprintf("%.17g", d); //https://stackoverflow.com/questions/16839658/printf-width-specifier-to-maintain-precision-of-floating-point-value
+#endif
         if ((!strchr(tmp.c_str(), '.')) && (!strchr(tmp.c_str(), 'e'))) tmp += ".0";
         return tmp;