@antv/scale - npm Package Compare versions

Comparing version 0.3.11 to 0.3.12

esm/util/extended.js

@@ -51,3 +51,3 @@ import { head, indexOf, size, last } from '@antv/util';
 // 解决 js 计算精度问题
-function pretty(n) {
+function prettyNumber(n) {
     return n < 1e-15 ? n : parseFloat(n.toFixed(15));
@@ -94,4 +94,4 @@ }
     while (j < Infinity) {
-        for (var i_1 = 0; i_1 < Q.length; i_1 += 1) {
-            var q = Q[i_1];
+        for (var i = 0; i < Q.length; i += 1) {
+            var q = Q[i];
             var sm = simplicityMax(q, Q, j);
@@ -118,21 +118,20 @@ if (w[0] * sm + w[1] + w[2] + w[3] < best.score) {
                     var maxStart = Math.ceil(dMin / step) * j;
-                    if (minStart > maxStart) {
-                        z += 1;
-                        // eslint-disable-next-line no-continue
-                        continue;
-                    }
-                    for (var start = minStart; start <= maxStart; start += 1) {
-                        var lMin = start * (step / j);
-                        var lMax = lMin + step * (k - 1);
-                        var lStep = step;
-                        var s = simplicity(q, Q, j, lMin, lMax, lStep);
-                        var c = coverage(dMin, dMax, lMin, lMax);
-                        var g = density(k, m, dMin, dMax, lMin, lMax);
-                        var l = legibility();
-                        var score = w[0] * s + w[1] * c + w[2] * g + w[3] * l;
-                        if (score > best.score && (!onlyLoose || (lMin <= dMin && lMax >= dMax))) {
-                            best.lmin = lMin;
-                            best.lmax = lMax;
-                            best.lstep = lStep;
-                            best.score = score;
+                    if (minStart <= maxStart) {
+                        var count = maxStart - minStart;
+                        for (var i_1 = 0; i_1 <= count; i_1 += 1) {
+                            var start = minStart + i_1;
+                            var lMin = start * (step / j);
+                            var lMax = lMin + step * (k - 1);
+                            var lStep = step;
+                            var s = simplicity(q, Q, j, lMin, lMax, lStep);
+                            var c = coverage(dMin, dMax, lMin, lMax);
+                            var g = density(k, m, dMin, dMax, lMin, lMax);
+                            var l = legibility();
+                            var score = w[0] * s + w[1] * c + w[2] * g + w[3] * l;
+                            if (score > best.score && (!onlyLoose || (lMin <= dMin && lMax >= dMax))) {
+                                best.lmin = lMin;
+                                best.lmax = lMax;
+                                best.lstep = lStep;
+                                best.score = score;
+                            }
                         }
@@ -147,8 +146,7 @@ }
     }
-    var size = Math.floor((best.lmax - best.lmin) / best.lstep);
-    var ticks = new Array(size);
-    var i = 0;
-    for (var tick = best.lmin; tick <= best.lmax; tick += best.lstep) {
-        ticks[i] = pretty(tick);
-        i += 1;
+    var lmax = best.lmax, lmin = best.lmin, lstep = best.lstep;
+    var tickCount = Math.floor((lmax - lmin) / lstep) + 1;
+    var ticks = new Array(tickCount);
+    for (var i = 0; i < tickCount; i++) {
+        ticks[i] = prettyNumber(lmin + i * lstep);
     }
@@ -155,0 +153,0 @@ return {

esm/util/pretty.d.ts

 export default function pretty(min: number, max: number, n?: number): {
+    min: number;
     max: number;
-    min: number;
     ticks: any[];
 };

esm/util/pretty.js

@@ -0,8 +1,6 @@
+function prettyNumber(n) {
+    return n < 1e-15 ? n : parseFloat(n.toFixed(15));
+}
 export default function pretty(min, max, n) {
     if (n === void 0) { n = 5; }
-    var res = {
-        max: 0,
-        min: 0,
-        ticks: [],
-    };
     if (min === max) {
@@ -32,3 +30,2 @@ return {
     var base = Math.pow(10, Math.floor(Math.log10(c)));
-    var toFixed = base < 1 ? Math.ceil(Math.abs(Math.log10(base))) : 0;
     var unit = base;
@@ -46,15 +43,15 @@ if (2 * base - c < h * (c - unit)) {
     var ns = Math.floor(min / unit);
-    res.max = Math.max(nu * unit, max);
-    res.min = Math.min(ns * unit, min);
-    var x = Number.parseFloat((ns * unit).toFixed(toFixed));
-    while (x < max) {
-        res.ticks.push(x);
-        x += unit;
-        if (toFixed) {
-            x = Number.parseFloat(x.toFixed(toFixed));
-        }
+    var hi = Math.max(nu * unit, max);
+    var lo = Math.min(ns * unit, min);
+    var size = Math.floor((hi - lo) / unit) + 1;
+    var ticks = new Array(size);
+    for (var i = 0; i < size; i++) {
+        ticks[i] = prettyNumber(lo + i * unit);
     }
-    res.ticks.push(x);
-    return res;
+    return {
+        min: lo,
+        max: hi,
+        ticks: ticks,
+    };
 }
 //# sourceMappingURL=pretty.js.map

lib/util/extended.js

@@ -54,3 +54,3 @@ "use strict";
 // 解决 js 计算精度问题
-function pretty(n) {
+function prettyNumber(n) {
     return n < 1e-15 ? n : parseFloat(n.toFixed(15));
@@ -97,4 +97,4 @@ }
     while (j < Infinity) {
-        for (var i_1 = 0; i_1 < Q.length; i_1 += 1) {
-            var q = Q[i_1];
+        for (var i = 0; i < Q.length; i += 1) {
+            var q = Q[i];
             var sm = simplicityMax(q, Q, j);
@@ -121,21 +121,20 @@ if (w[0] * sm + w[1] + w[2] + w[3] < best.score) {
                     var maxStart = Math.ceil(dMin / step) * j;
-                    if (minStart > maxStart) {
-                        z += 1;
-                        // eslint-disable-next-line no-continue
-                        continue;
-                    }
-                    for (var start = minStart; start <= maxStart; start += 1) {
-                        var lMin = start * (step / j);
-                        var lMax = lMin + step * (k - 1);
-                        var lStep = step;
-                        var s = simplicity(q, Q, j, lMin, lMax, lStep);
-                        var c = coverage(dMin, dMax, lMin, lMax);
-                        var g = density(k, m, dMin, dMax, lMin, lMax);
-                        var l = legibility();
-                        var score = w[0] * s + w[1] * c + w[2] * g + w[3] * l;
-                        if (score > best.score && (!onlyLoose || (lMin <= dMin && lMax >= dMax))) {
-                            best.lmin = lMin;
-                            best.lmax = lMax;
-                            best.lstep = lStep;
-                            best.score = score;
+                    if (minStart <= maxStart) {
+                        var count = maxStart - minStart;
+                        for (var i_1 = 0; i_1 <= count; i_1 += 1) {
+                            var start = minStart + i_1;
+                            var lMin = start * (step / j);
+                            var lMax = lMin + step * (k - 1);
+                            var lStep = step;
+                            var s = simplicity(q, Q, j, lMin, lMax, lStep);
+                            var c = coverage(dMin, dMax, lMin, lMax);
+                            var g = density(k, m, dMin, dMax, lMin, lMax);
+                            var l = legibility();
+                            var score = w[0] * s + w[1] * c + w[2] * g + w[3] * l;
+                            if (score > best.score && (!onlyLoose || (lMin <= dMin && lMax >= dMax))) {
+                                best.lmin = lMin;
+                                best.lmax = lMax;
+                                best.lstep = lStep;
+                                best.score = score;
+                            }
                         }
@@ -150,8 +149,7 @@ }
     }
-    var size = Math.floor((best.lmax - best.lmin) / best.lstep);
-    var ticks = new Array(size);
-    var i = 0;
-    for (var tick = best.lmin; tick <= best.lmax; tick += best.lstep) {
-        ticks[i] = pretty(tick);
-        i += 1;
+    var lmax = best.lmax, lmin = best.lmin, lstep = best.lstep;
+    var tickCount = Math.floor((lmax - lmin) / lstep) + 1;
+    var ticks = new Array(tickCount);
+    for (var i = 0; i < tickCount; i++) {
+        ticks[i] = prettyNumber(lmin + i * lstep);
     }
@@ -158,0 +156,0 @@ return {

lib/util/pretty.d.ts

 export default function pretty(min: number, max: number, n?: number): {
+    min: number;
     max: number;
-    min: number;
     ticks: any[];
 };

lib/util/pretty.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+function prettyNumber(n) {
+    return n < 1e-15 ? n : parseFloat(n.toFixed(15));
+}
 function pretty(min, max, n) {
     if (n === void 0) { n = 5; }
-    var res = {
-        max: 0,
-        min: 0,
-        ticks: [],
-    };
     if (min === max) {
@@ -34,3 +32,2 @@ return {
     var base = Math.pow(10, Math.floor(Math.log10(c)));
-    var toFixed = base < 1 ? Math.ceil(Math.abs(Math.log10(base))) : 0;
     var unit = base;
@@ -48,16 +45,16 @@ if (2 * base - c < h * (c - unit)) {
     var ns = Math.floor(min / unit);
-    res.max = Math.max(nu * unit, max);
-    res.min = Math.min(ns * unit, min);
-    var x = Number.parseFloat((ns * unit).toFixed(toFixed));
-    while (x < max) {
-        res.ticks.push(x);
-        x += unit;
-        if (toFixed) {
-            x = Number.parseFloat(x.toFixed(toFixed));
-        }
+    var hi = Math.max(nu * unit, max);
+    var lo = Math.min(ns * unit, min);
+    var size = Math.floor((hi - lo) / unit) + 1;
+    var ticks = new Array(size);
+    for (var i = 0; i < size; i++) {
+        ticks[i] = prettyNumber(lo + i * unit);
     }
-    res.ticks.push(x);
-    return res;
+    return {
+        min: lo,
+        max: hi,
+        ticks: ticks,
+    };
 }
 exports.default = pretty;
 //# sourceMappingURL=pretty.js.map

package.json

 {
   "name": "@antv/scale",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "description": "The scale module for G2",
@@ -5,0 +5,0 @@ "author": "https://github.com/orgs/antvis/people",

src/util/extended.ts

@@ -63,3 +63,3 @@ import { head, indexOf, size, last } from '@antv/util';
 // 解决 js 计算精度问题
-function pretty(n: number) {
+function prettyNumber(n: number) {
   return n < 1e-15 ? n : parseFloat(n.toFixed(15));
@@ -141,23 +141,22 @@ }
 
-          if (minStart > maxStart) {
-            z += 1;
-            // eslint-disable-next-line no-continue
-            continue;
-          }
-          for (let start = minStart; start <= maxStart; start += 1) {
-            const lMin = start * (step / j);
-            const lMax = lMin + step * (k - 1);
-            const lStep = step;
+          if (minStart <= maxStart) {
+            const count = maxStart - minStart;
+            for (let i = 0; i <= count; i += 1) {
+              const start = minStart + i;
+              const lMin = start * (step / j);
+              const lMax = lMin + step * (k - 1);
+              const lStep = step;
 
-            const s = simplicity(q, Q, j, lMin, lMax, lStep);
-            const c = coverage(dMin, dMax, lMin, lMax);
-            const g = density(k, m, dMin, dMax, lMin, lMax);
-            const l = legibility();
+              const s = simplicity(q, Q, j, lMin, lMax, lStep);
+              const c = coverage(dMin, dMax, lMin, lMax);
+              const g = density(k, m, dMin, dMax, lMin, lMax);
+              const l = legibility();
 
-            const score = w[0] * s + w[1] * c + w[2] * g + w[3] * l;
-            if (score > best.score && (!onlyLoose || (lMin <= dMin && lMax >= dMax))) {
-              best.lmin = lMin;
-              best.lmax = lMax;
-              best.lstep = lStep;
-              best.score = score;
+              const score = w[0] * s + w[1] * c + w[2] * g + w[3] * l;
+              if (score > best.score && (!onlyLoose || (lMin <= dMin && lMax >= dMax))) {
+                best.lmin = lMin;
+                best.lmax = lMax;
+                best.lstep = lStep;
+                best.score = score;
+              }
             }
@@ -173,11 +172,9 @@ }
 
-  const size = Math.floor((best.lmax - best.lmin) / best.lstep);
-  const ticks = new Array(size);
-  let i = 0;
+  const { lmax, lmin, lstep } = best;
+  const tickCount = Math.floor((lmax - lmin) / lstep) + 1;
+  const ticks = new Array(tickCount);
+  for (let i = 0; i < tickCount; i++) {
+    ticks[i] = prettyNumber(lmin + i * lstep);
+  }
 
-  for (let tick = best.lmin; tick <= best.lmax; tick += best.lstep) {
-    ticks[i] = pretty(tick);
-    i += 1;
-  }
-  
   return {
@@ -184,0 +181,0 @@ min: Math.min(dMin, head(ticks)),

src/util/pretty.ts

@@ -0,9 +1,6 @@
+function prettyNumber(n: number) {
+  return n < 1e-15 ? n : parseFloat(n.toFixed(15));
+}
+
 export default function pretty(min: number, max: number, n: number = 5) {
-
-  const res = {
-    max: 0,
-    min: 0,
-    ticks: [],
-  };
-
   if (min === max) {
@@ -35,3 +32,2 @@ return {
   const base = Math.pow(10, Math.floor(Math.log10(c)));
-  const toFixed = base < 1 ? Math.ceil(Math.abs(Math.log10(base))) : 0;
   let unit = base;
@@ -50,16 +46,16 @@ if (2 * base - c < h * (c - unit)) {
 
-  res.max = Math.max(nu * unit, max);
-  res.min = Math.min(ns * unit, min);
+  const hi = Math.max(nu * unit, max);
+  const lo = Math.min(ns * unit, min);
 
-  let x = Number.parseFloat((ns * unit).toFixed(toFixed));
-  while (x < max) {
-    res.ticks.push(x);
-    x += unit;
-    if (toFixed) {
-      x = Number.parseFloat(x.toFixed(toFixed));
-    }
+  const size = Math.floor((hi - lo) / unit) + 1;
+  const ticks = new Array(size);
+  for (let i = 0; i < size; i++) {
+    ticks[i] = prettyNumber(lo + i * unit);
   }
-  res.ticks.push(x);
 
-  return res;
+  return {
+    min: lo,
+    max: hi,
+    ticks,
+  };
 }

No alert changes

Worsened metrics

Total package byte prevSize

323854

-0.08%

Lines of code

6042

-0.25%

No dependency changes