UI

[inverse-tax] / tax.js

diff --git a/tax.js b/tax.js
index d26db5fa15f0b8cf0cdd006fd4b19cc4f6e37076..f3d2406cce017d7fbb7b9056d2be507b7b3f5990 100644 (file)
--- a/tax.js
+++ b/tax.js
@@ -7,11 +7,15 @@ function parse_table(as_text) {
   return as_text.trim().split('\n').map(parse_line);
 }
 
   return as_text.trim().split('\n').map(parse_line);
 }
 

-function parse_tax_table(as_text) {
-  return parse_table(as_text).map(([start, rate], i, table) =>
+function tax_table_from_table(table) {
+  return table.map(([start, rate], i, table) =>

     [start, i < table.length - 1 ? table[i+1][0] : Infinity, rate / 100.0]);
 }
 
     [start, i < table.length - 1 ? table[i+1][0] : Infinity, rate / 100.0]);
 }
 

+function parse_tax_table(as_text) {
+  return tax_table_from_table(parse_table(as_text));
+}
+

 function sum(nums) {
   return nums.reduce((total, num) => total + num, 0);
 }
 function sum(nums) {
   return nums.reduce((total, num) => total + num, 0);
 }


@@ -49,8 +53,6 @@ function merge_tax_tables(t1, t2) {
 }
 
 function invert(table) {
 }
 
 function invert(table) {

-  if (table.length == 0) return x => x;
-

   // Here we solve
   //   net = m * gross + b
   // for gross:
   // Here we solve
   //   net = m * gross + b
   // for gross:


@@ -59,7 +61,7 @@ function invert(table) {
   // and the calculate the inverse's bounds
 
   const ms = table.map(([start, end, rate]) => 1 - rate);
   // and the calculate the inverse's bounds
 
   const ms = table.map(([start, end, rate]) => 1 - rate);

-  const full_brackets = [[0]].concat(table.map(([start, end, rate]) => (end - start) * rate)).slice(0, table.length);
+  const full_brackets = [0].concat(table.map(([start, end, rate]) => (end - start) * rate)).slice(0, table.length);

   function sum_lower_brackets(remaining_brackets, acc = 0) {
     if (remaining_brackets.length == 0) return [];
     return [acc + remaining_brackets[0]].concat(sum_lower_brackets(remaining_brackets.slice(1), acc + remaining_brackets[0]));
   function sum_lower_brackets(remaining_brackets, acc = 0) {
     if (remaining_brackets.length == 0) return [];
     return [acc + remaining_brackets[0]].concat(sum_lower_brackets(remaining_brackets.slice(1), acc + remaining_brackets[0]));


@@ -78,13 +80,14 @@ function invert(table) {
   const inverse_table = table.map(([start, end, rate], i) => {
     const m = ms[i];
     const b = bs[i];
   const inverse_table = table.map(([start, end, rate], i) => {
     const m = ms[i];
     const b = bs[i];

-    return [(start - b) / m, (end - b) / m, m, b];
+    return [m * start + b, m * end + b, m, b];

   });
   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 (start <= net && net <= end) {

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

+    return net;

   };
 }
   };
 }