Loose equality comparisons for floats

diff --git a/tax.js b/tax.js
index 2687387b60eb509d9341adbf40ba1add4010a07f..10c44f3035e3c81fd21dcfe9554f754e0f93efa0 100644 (file)
--- a/tax.js
+++ b/tax.js
@@ -1,5 +1,13 @@
 "use strict";
 
 "use strict";
 

+function near(a, b, epsilon = 1e-6) {
+  return Math.abs(a - b) < epsilon;
+}
+
+function less_than_or_near(a, b, epsilon = 1e-6) {
+  return a < b || near(a, b, epsilon);
+}
+

 function parse_table(as_text) {
   function parse_line(line) {
     return line.trim().split(' ').filter(x => x !== '').map(x => parseFloat(x));
 function parse_table(as_text) {
   function parse_line(line) {
     return line.trim().split(' ').filter(x => x !== '').map(x => parseFloat(x));


@@ -83,7 +91,7 @@ function invert(table) {
   });
   return function(net) {
     for (const [start, end, m, b] of inverse_table) {
   });
   return function(net) {
     for (const [start, end, m, b] of inverse_table) {

-      if (start <= net && net <= end) {
+      if (less_than_or_near(start, net) && less_than_or_near(net, end)) {

         return (net - b) / m;
       }
     }
         return (net - b) / m;
       }
     }

diff --git a/tax.test.js b/tax.test.js
index 29f436fa957586671113770afc7cd182ebe9074c..5080001436529b89c94c58dc4fbe90ef1f89e98a 100644 (file)
--- a/tax.test.js
+++ b/tax.test.js
@@ -6,10 +6,6 @@ function test(description, f) {
   f();
 }
 
   f();
 }
 

-function near(a, b, epsilon = 1e-6) {
-  return Math.abs(a - b) < epsilon;
-}
-

 function rand(limit = 99) {
   return Math.round(Math.random() * limit);
 }
 function rand(limit = 99) {
   return Math.round(Math.random() * limit);
 }