Changeset 970 for cpp/frams

Timestamp:

06/30/20 00:34:59 (4 years ago)

Author:

Maciej Komosinski

Message:

Added functions to properly round floating point values to specified precision

Location:

cpp/frams/util

Files:

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

cpp/frams/util/sstring-simple.cpp

@@ -3 +3 @@
 #include "extvalue.h"
 #include <assert.h>
-#ifdef USE_PRINTFLOAT_DRAGON4
-#include <PrintFloat/PrintFloat.h>
-#endif
+#include <common/nonstd_math.h>
+
 
 void SString::initEmpty()
@@ -227 +226 @@
 SString SString::valueOf(double 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
+        tmp.endWrite(doubleToString(d, -1, here, 30));
         if ((!strchr(tmp.c_str(), '.')) && (!strchr(tmp.c_str(), 'e'))) tmp += ".0";
         return tmp;

cpp/frams/util/sstring.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -23 +23 @@
 #include "extvalue.h"
 #include <assert.h>
-#ifdef USE_PRINTFLOAT_DRAGON4
-#include <PrintFloat/PrintFloat.h>
-#endif
+#include <common/nonstd_math.h>
 
 #ifdef MULTITHREADED
@@ -367 +365 @@
 SString SString::valueOf(double 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
+        tmp.endWrite(doubleToString(d, -1, here, 30));
         if ((!strchr(tmp.c_str(), '.')) && (!strchr(tmp.c_str(), 'e'))) tmp += ".0";
         return tmp;