do not use almost equal instead eliminate problematic digits

archmoj · archmoj · commit fd312fdd24b7 · 2022-04-20T18:31:23.000-04:00
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -972,7 +972,11 @@ axes.calcTicks = function calcTicks(ax, opts) {
                 }
                 var found = false;
                 for(var q = 0; !found && (q < tickVals.length); q++) {
-                    if(almostEq(v, tickVals[q].value)) {
+                    if(
+                        // add 1000 to eliminate problematic digits
+                        1000 + tickVals[q].value ===
+                        1000 + v
+                    ) {
                         found = true;
                     }
                 }
@@ -1855,13 +1859,13 @@ function formatAngle(ax, out, hover, extraPrecision, hideexp) {
     }
 }
 
-function almostEq(a, b) {
-    return Math.abs(a - b) <= 1e-6;
-}
-
 // inspired by
 // https://github.com/yisibl/num2fraction/blob/master/index.js
 function num2frac(num) {
+    function almostEq(a, b) {
+        return Math.abs(a - b) <= 1e-6;
+    }
+
     function findGCD(a, b) {
         return almostEq(b, 0) ? a : findGCD(b, a % b);
     }

Original file line number	Diff line number	Diff line change
`@@ -972,7 +972,11 @@ axes.calcTicks = function calcTicks(ax, opts) {`
`972`	`972`	`}`
`973`	`973`	`var found = false;`
`974`	`974`	`for(var q = 0; !found && (q < tickVals.length); q++) {`
`975`		`- if(almostEq(v, tickVals[q].value)) {`
	`975`	`+ if(`
	`976`	`+ // add 1000 to eliminate problematic digits`
	`977`	`+ 1000 + tickVals[q].value ===`
	`978`	`+ 1000 + v`
	`979`	`+ ) {`
`976`	`980`	`found = true;`
`977`	`981`	`}`
`978`	`982`	`}`
`@@ -1855,13 +1859,13 @@ function formatAngle(ax, out, hover, extraPrecision, hideexp) {`
`1855`	`1859`	`}`
`1856`	`1860`	`}`
`1857`	`1861`
`1858`		`-function almostEq(a, b) {`
`1859`		`- return Math.abs(a - b) <= 1e-6;`
`1860`		`-}`
`1861`		`-`
`1862`	`1862`	`// inspired by`
`1863`	`1863`	`// https://github.com/yisibl/num2fraction/blob/master/index.js`
`1864`	`1864`	`function num2frac(num) {`
	`1865`	`+ function almostEq(a, b) {`
	`1866`	`+ return Math.abs(a - b) <= 1e-6;`
	`1867`	`+ }`
	`1868`	`+`
`1865`	`1869`	`function findGCD(a, b) {`
`1866`	`1870`	`return almostEq(b, 0) ? a : findGCD(b, a % b);`
`1867`	`1871`	`}`