From 7302c91fe800dbd5ef710208f553480fac6d185c Mon Sep 17 00:00:00 2001 From: Martin Holmer Date: Wed, 25 Apr 2018 12:08:22 -0400 Subject: [PATCH 01/12] Update RELEASES.md info --- RELEASES.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 32d196c53..f1a45f488 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -4,6 +4,25 @@ Go [here](https://github.com/open-source-economics/Tax-Calculator/pulls?q=is%3Ap for a complete commit history. +2018-05-?? Release 0.20.0 +------------------------- +(last merged pull request is +[#xxxx](https://github.com/open-source-economics/Tax-Calculator/pull/xxxx)) + +**API Changes** +- None + +**New Features** +- Streamline logic that prevents disclosure of details of PUF filing units + [[#1979](https://github.com/open-source-economics/Tax-Calculator/pull/1979) + by Martin Holmer] + +**Bug Fixes** +- Fix mishandling of boolean policy parameters + [[#1982](https://github.com/open-source-economics/Tax-Calculator/pull/1982) + by Hank Doupe] + + 2018-04-19 Release 0.19.0 ------------------------- (last merged pull request is From 3e9443316e5cdcf3ff890fc92e3f2c494d96ee7d Mon Sep 17 00:00:00 2001 From: Martin Holmer Date: Thu, 26 Apr 2018 14:41:36 -0400 Subject: [PATCH 02/12] Update RELEASES.md info --- RELEASES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASES.md b/RELEASES.md index f1a45f488..21dfd3c61 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -10,7 +10,9 @@ for a complete commit history. [#xxxx](https://github.com/open-source-economics/Tax-Calculator/pull/xxxx)) **API Changes** -- None +- Simplify table-creation Calculator methods and related utility functions + [[#1984](https://github.com/open-source-economics/Tax-Calculator/pull/1984) + by Martin Holmer] **New Features** - Streamline logic that prevents disclosure of details of PUF filing units From f7058171ed03b45f432b6a00ac72a8c553f2428d Mon Sep 17 00:00:00 2001 From: Martin Holmer Date: Sat, 28 Apr 2018 12:34:06 -0400 Subject: [PATCH 03/12] Update RELEASES.md info --- RELEASES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 21dfd3c61..e2963590f 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -18,6 +18,9 @@ for a complete commit history. - Streamline logic that prevents disclosure of details of PUF filing units [[#1979](https://github.com/open-source-economics/Tax-Calculator/pull/1979) by Martin Holmer] +- Add option to not include benefits in a Records object that uses CPS data + [[#1985](https://github.com/open-source-economics/Tax-Calculator/pull/1985) + by Martin Holmer] **Bug Fixes** - Fix mishandling of boolean policy parameters From 4301c28ad128b6392377637166718817d4314a58 Mon Sep 17 00:00:00 2001 From: Martin Holmer Date: Tue, 1 May 2018 17:06:53 -0400 Subject: [PATCH 04/12] Update RELEASES.md info --- RELEASES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index e2963590f..99e216d23 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -20,6 +20,11 @@ for a complete commit history. by Martin Holmer] - Add option to not include benefits in a Records object that uses CPS data [[#1985](https://github.com/open-source-economics/Tax-Calculator/pull/1985) + and + [[#1988](https://github.com/open-source-economics/Tax-Calculator/pull/1988) + by Martin Holmer] +- Update CODING and TESTING documentation to reflect recommended usage of `pycodestyle` in place of `pep8` + [[#1989](https://github.com/open-source-economics/Tax-Calculator/pull/1989) by Martin Holmer] **Bug Fixes** From 0f21adea369a0f17035ca8b40d3923bec9fa5f48 Mon Sep 17 00:00:00 2001 From: martinholmer Date: Tue, 8 May 2018 12:19:02 -0400 Subject: [PATCH 05/12] Update RELEASES.md info --- RELEASES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 99e216d23..0e410ac63 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -13,6 +13,9 @@ for a complete commit history. - Simplify table-creation Calculator methods and related utility functions [[#1984](https://github.com/open-source-economics/Tax-Calculator/pull/1984) by Martin Holmer] +- Add validity checking for non-behavior assumption parameters + [[#1992](https://github.com/open-source-economics/Tax-Calculator/pull/1992) + by Martin Holmer] **New Features** - Streamline logic that prevents disclosure of details of PUF filing units @@ -26,6 +29,9 @@ for a complete commit history. - Update CODING and TESTING documentation to reflect recommended usage of `pycodestyle` in place of `pep8` [[#1989](https://github.com/open-source-economics/Tax-Calculator/pull/1989) by Martin Holmer] +- Add Tax-Calculator Cookbook recipe using Behavior class and its static `response` method + [[#1993](https://github.com/open-source-economics/Tax-Calculator/pull/1993) + by Martin Holmer] **Bug Fixes** - Fix mishandling of boolean policy parameters From eff03363d36deaa002b2a56fda491a3a6b4f48e5 Mon Sep 17 00:00:00 2001 From: martinholmer Date: Thu, 10 May 2018 18:36:10 -0400 Subject: [PATCH 06/12] Update RELEASES.md info --- RELEASES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 0e410ac63..1ecd8110d 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -16,6 +16,9 @@ for a complete commit history. - Add validity checking for non-behavior assumption parameters [[#1992](https://github.com/open-source-economics/Tax-Calculator/pull/1992) by Martin Holmer] +- Add `charitable_giving_response` utility function and remove obsolete charity logic from Behavior class + [[#1995](https://github.com/open-source-economics/Tax-Calculator/pull/1995) + by Martin Holmer] **New Features** - Streamline logic that prevents disclosure of details of PUF filing units @@ -32,6 +35,9 @@ for a complete commit history. - Add Tax-Calculator Cookbook recipe using Behavior class and its static `response` method [[#1993](https://github.com/open-source-economics/Tax-Calculator/pull/1993) by Martin Holmer] +- Add Tax-Calculator Cookbook recipe showing how to create a custom table + [[#1994](https://github.com/open-source-economics/Tax-Calculator/pull/1994) + by Martin Holmer] **Bug Fixes** - Fix mishandling of boolean policy parameters From 6863ac554932e577a713397b740f8347da2d296c Mon Sep 17 00:00:00 2001 From: martinholmer Date: Fri, 11 May 2018 13:25:35 -0400 Subject: [PATCH 07/12] Update RELEASES.md info --- RELEASES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 1ecd8110d..1cb41d64c 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -19,6 +19,9 @@ for a complete commit history. - Add `charitable_giving_response` utility function and remove obsolete charity logic from Behavior class [[#1995](https://github.com/open-source-economics/Tax-Calculator/pull/1995) by Martin Holmer] +- Rename `Growfactors` class as `GrowFactors` and rename `Growdiff` class as `GrowDiff` + [[#1996](https://github.com/open-source-economics/Tax-Calculator/pull/1996) + by Martin Holmer] **New Features** - Streamline logic that prevents disclosure of details of PUF filing units From 6f2331b3b66d681815e6eec619fcc81238d6ff4e Mon Sep 17 00:00:00 2001 From: martinholmer Date: Fri, 11 May 2018 16:58:50 -0400 Subject: [PATCH 08/12] Update RELEASES.md info --- RELEASES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 1cb41d64c..265ec7664 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -16,12 +16,12 @@ for a complete commit history. - Add validity checking for non-behavior assumption parameters [[#1992](https://github.com/open-source-economics/Tax-Calculator/pull/1992) by Martin Holmer] -- Add `charitable_giving_response` utility function and remove obsolete charity logic from Behavior class - [[#1995](https://github.com/open-source-economics/Tax-Calculator/pull/1995) - by Martin Holmer] - Rename `Growfactors` class as `GrowFactors` and rename `Growdiff` class as `GrowDiff` [[#1996](https://github.com/open-source-economics/Tax-Calculator/pull/1996) by Martin Holmer] +- Add `quantity_response` utility function and remove obsolete charity and earnings response logic from Behavior class + [[#1997](https://github.com/open-source-economics/Tax-Calculator/pull/1997) + by Martin Holmer] **New Features** - Streamline logic that prevents disclosure of details of PUF filing units From 17fbaa8f28e01381b8228825acdf0068ce8bb26f Mon Sep 17 00:00:00 2001 From: martinholmer Date: Sat, 12 May 2018 13:12:59 -0400 Subject: [PATCH 09/12] Update RELEASES.md info --- RELEASES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 265ec7664..a65c64371 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -22,6 +22,9 @@ for a complete commit history. - Add `quantity_response` utility function and remove obsolete charity and earnings response logic from Behavior class [[#1997](https://github.com/open-source-economics/Tax-Calculator/pull/1997) by Martin Holmer] +- Add empty shell of `GrowModel` class that will eventually contain a simple macroeconomic growth model with annual feedback to the microeconomic simulation + [[#1998](https://github.com/open-source-economics/Tax-Calculator/pull/1998) + by Martin Holmer] **New Features** - Streamline logic that prevents disclosure of details of PUF filing units From 8a7dd1c65c6cc91428d4e6ac573a177e64a3d23c Mon Sep 17 00:00:00 2001 From: martinholmer Date: Tue, 15 May 2018 13:17:07 -0400 Subject: [PATCH 10/12] Update RELEASES.md info --- RELEASES.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index a65c64371..a5a6540ab 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -13,9 +13,6 @@ for a complete commit history. - Simplify table-creation Calculator methods and related utility functions [[#1984](https://github.com/open-source-economics/Tax-Calculator/pull/1984) by Martin Holmer] -- Add validity checking for non-behavior assumption parameters - [[#1992](https://github.com/open-source-economics/Tax-Calculator/pull/1992) - by Martin Holmer] - Rename `Growfactors` class as `GrowFactors` and rename `Growdiff` class as `GrowDiff` [[#1996](https://github.com/open-source-economics/Tax-Calculator/pull/1996) by Martin Holmer] @@ -38,7 +35,10 @@ for a complete commit history. - Update CODING and TESTING documentation to reflect recommended usage of `pycodestyle` in place of `pep8` [[#1989](https://github.com/open-source-economics/Tax-Calculator/pull/1989) by Martin Holmer] -- Add Tax-Calculator Cookbook recipe using Behavior class and its static `response` method +- Add validity checking for non-behavior assumption parameters + [[#1992](https://github.com/open-source-economics/Tax-Calculator/pull/1992) + by Martin Holmer] +- Add Tax-Calculator Cookbook recipe using Behavior class and its `response` method [[#1993](https://github.com/open-source-economics/Tax-Calculator/pull/1993) by Martin Holmer] - Add Tax-Calculator Cookbook recipe showing how to create a custom table From 69f1630238dc72f74528332821dd12ad95fd2259 Mon Sep 17 00:00:00 2001 From: martinholmer Date: Fri, 18 May 2018 17:20:41 -0400 Subject: [PATCH 11/12] Update cookbook recipe results --- RELEASES.md | 7 ++- docs/assumpA.json.html | 9 +-- docs/cookbook/ingredients/assumpA.json | 9 +-- docs/cookbook/recipe03.res | 4 +- docs/recipe00.graph.html | 10 +-- docs/recipe03.py.html | 4 +- docs/recipe03.res.html | 4 +- docs/recipe04.py.html | 84 ++++++++++++++++++++++++++ docs/recipe04.res.html | 61 +++++++++++++++++++ docs/reformB.json.html | 9 +++ 10 files changed, 180 insertions(+), 21 deletions(-) create mode 100644 docs/recipe04.py.html create mode 100644 docs/recipe04.res.html create mode 100644 docs/reformB.json.html diff --git a/RELEASES.md b/RELEASES.md index a5a6540ab..9c4fc6193 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -4,10 +4,10 @@ Go [here](https://github.com/open-source-economics/Tax-Calculator/pulls?q=is%3Ap for a complete commit history. -2018-05-?? Release 0.20.0 +2018-05-18 Release 0.20.0 ------------------------- (last merged pull request is -[#xxxx](https://github.com/open-source-economics/Tax-Calculator/pull/xxxx)) +[#2003](https://github.com/open-source-economics/Tax-Calculator/pull/2003)) **API Changes** - Simplify table-creation Calculator methods and related utility functions @@ -44,6 +44,9 @@ for a complete commit history. - Add Tax-Calculator Cookbook recipe showing how to create a custom table [[#1994](https://github.com/open-source-economics/Tax-Calculator/pull/1994) by Martin Holmer] +- Add Tax-Calculator Cookbook recipe showing how to use new `quantity_response` utility function + [[#2002](https://github.com/open-source-economics/Tax-Calculator/pull/2002) + by Martin Holmer] **Bug Fixes** - Fix mishandling of boolean policy parameters diff --git a/docs/assumpA.json.html b/docs/assumpA.json.html index 7e426570f..b04847695 100644 --- a/docs/assumpA.json.html +++ b/docs/assumpA.json.html @@ -1,17 +1,18 @@ assumpA.json
-// NEVER SPECIFY BOTH behavior AND growdiff_response IN SAME RUN
+// This JSON economic assumption file specifies a non-zero substitution
+// elasticity for taxable income, which causes a response in taxable income
+// to a reform-induced change in marginal tax rates
 {
     "consumption": {
     },
     "behavior": {
-	// specify non-zero substitution elasticity of taxable income,
-        // which is response of taxable income to change in marginal tax rate
 	"_BE_sub": {"2013": [0.25]}
     },
     "growdiff_baseline": {
     },
     "growdiff_response": {
-        // MUST BE EMPTY BECAUSE ASSUMING BEHAVIORAL RESPONSE
+    },
+    "growmodel": {
     }
 }
diff --git a/docs/cookbook/ingredients/assumpA.json b/docs/cookbook/ingredients/assumpA.json index 1f02b7d07..d2d384f8b 100644 --- a/docs/cookbook/ingredients/assumpA.json +++ b/docs/cookbook/ingredients/assumpA.json @@ -1,15 +1,16 @@ -// NEVER SPECIFY BOTH behavior AND growdiff_response IN SAME RUN +// This JSON economic assumption file specifies a non-zero substitution +// elasticity for taxable income, which causes a response in taxable income +// to a reform-induced change in marginal tax rates { "consumption": { }, "behavior": { - // specify non-zero substitution elasticity of taxable income, - // which is response of taxable income to change in marginal tax rate "_BE_sub": {"2013": [0.25]} }, "growdiff_baseline": { }, "growdiff_response": { - // MUST BE EMPTY BECAUSE ASSUMING BEHAVIORAL RESPONSE + }, + "growmodel": { } } diff --git a/docs/cookbook/recipe03.res b/docs/cookbook/recipe03.res index 2c4c2f33e..938cbf881 100644 --- a/docs/cookbook/recipe03.res +++ b/docs/cookbook/recipe03.res @@ -4,8 +4,8 @@ WARNING: Tax-Calculator packages for Python 2.7 will no longer be provided beginning in 2019 because Pandas is stopping development for 2.7 SOLUTION: upgrade to Python 3.6 now -Filing Units Receiving EITC and Average Positive EITC by AGI category -AGI category Num(#M) Avg($K) +Filing Units Receiving EITC and Average Positive EITC by AGI Category +AGI Category Num(#M) Avg($K) [-9e+99, 1.0) 0.059 1.340 [1.0, 5000.0) 1.772 0.711 [5000.0, 10000.0) 3.672 1.638 diff --git a/docs/recipe00.graph.html b/docs/recipe00.graph.html index a01851df8..b5f7658c1 100644 --- a/docs/recipe00.graph.html +++ b/docs/recipe00.graph.html @@ -15,11 +15,11 @@
-
+
-