Optimise toString(10)

MikeMcl · Jan 13, 2019 · 3bcba45 · 3bcba45
1 parent 171e195
commit 3bcba45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/bignumber.js b/bignumber.js
@@ -2669,15 +2669,16 @@
           str = 'NaN';
         }
       } else {
-        str = coeffToString(n.c);
-
         if (b == null) {
           str = e <= TO_EXP_NEG || e >= TO_EXP_POS
-           ? toExponential(str, e)
-           : toFixedPoint(str, e, '0');
+           ? toExponential(coeffToString(n.c), e)
+           : toFixedPoint(coeffToString(n.c), e, '0');
+        } else if (b === 10) {
+          n = round(new BigNumber(n), DECIMAL_PLACES + e + 1, ROUNDING_MODE);
+          str = toFixedPoint(coeffToString(n.c), n.e, '0');
         } else {
           intCheck(b, 2, ALPHABET.length, 'Base');
-          str = convertBase(toFixedPoint(str, e, '0'), 10, b, s, true);
+          str = convertBase(toFixedPoint(coeffToString(n.c), e, '0'), 10, b, s, true);
         }
 
         if (s < 0 && n.c[0]) str = '-' + str;

diff --git a/bignumber.mjs b/bignumber.mjs
@@ -756,9 +756,9 @@ function clone(configObject) {
       sum = new BigNumber(args[0]);
     for (; i < args.length;) sum = sum.plus(args[i++]);
     return sum;
-  };  
+  };
+
 
-
   // PRIVATE FUNCTIONS
 
 
@@ -2665,15 +2665,16 @@ function clone(configObject) {
         str = 'NaN';
       }
     } else {
-      str = coeffToString(n.c);
-
       if (b == null) {
         str = e <= TO_EXP_NEG || e >= TO_EXP_POS
-         ? toExponential(str, e)
-         : toFixedPoint(str, e, '0');
+         ? toExponential(coeffToString(n.c), e)
+         : toFixedPoint(coeffToString(n.c), e, '0');
+      } else if (b === 10) {
+        n = round(new BigNumber(n), DECIMAL_PLACES + e + 1, ROUNDING_MODE);
+        str = toFixedPoint(coeffToString(n.c), n.e, '0');
       } else {
         intCheck(b, 2, ALPHABET.length, 'Base');
-        str = convertBase(toFixedPoint(str, e, '0'), 10, b, s, true);
+        str = convertBase(toFixedPoint(coeffToString(n.c), e, '0'), 10, b, s, true);
       }
 
       if (s < 0 && n.c[0]) str = '-' + str;