Merge pull request #1838 from martinholmer/add-cpi-inflatable

Add cpi_inflatable field for each parameter in the four JSON parameters files
PSLmodels · Jan 20, 2018 · dbc3d8d · dbc3d8d
2 parents 009c5a7 + 4ae9fe5
commit dbc3d8d
Show file tree

Hide file tree

Showing 10 changed files with 340 additions and 52 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -4,7 +4,7 @@ Go [here](https://github.com/open-source-economics/Tax-Calculator/pulls?q=is%3Ap
 for a complete commit history.
 
 
-2018-01-?? Release 0.15.1
+2018-01-?? Release 0.15.2
 -------------------------
 (last merged pull request is
 [#18xx](https://github.com/open-source-economics/Tax-Calculator/pull/18xx))
@@ -21,6 +21,23 @@ for a complete commit history.
 - None
 
 
+2018-01-20 Release 0.15.1
+-------------------------
+(last merged pull request is
+[#1838](https://github.com/open-source-economics/Tax-Calculator/pull/1838))
+
+**API Changes**
+- None
+
+**New Features**
+- Add `cpi_inflatable` field for each parameter in the four JSON parameter files
+  [[#1838](https://github.com/open-source-economics/Tax-Calculator/pull/1838)
+  by Martin Holmer as requested by Hank Doupe]
+
+**Bug Fixes**
+- None
+
+
 2018-01-18 Release 0.15.0
 -------------------------
 (last merged pull request is

diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/make_index.py b/docs/make_index.py
@@ -66,7 +66,7 @@ def policy_param_text(pname, param):
     """
     Extract info from param for pname and return as HTML string.
     """
-    # pylint: disable=too-many-branches,len-as-condition
+    # pylint: disable=too-many-statements,too-many-branches,len-as-condition
     sec1 = param['section_1']
     if len(sec1) > 0:
         txt = '<p><b>{} &mdash; {}</b>'.format(sec1, param['section_2'])
@@ -81,14 +81,18 @@ def policy_param_text(pname, param):
     txt += '<br><i>Description:</i> {}'.format(param['description'])
     if len(param['notes']) > 0:
         txt += '<br><i>Notes:</i> {}'.format(param['notes'])
+    if param['cpi_inflatable']:
+        txt += '<br><i>Can Be Inflation Indexed:</i> True'
+    else:
+        txt += '<br><i>Can Be Inflation Indexed:</i> False'
     if param['cpi_inflated']:
-        txt += '<br><i>Inflation Indexed:</i> True'
+        txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Is Inflation Indexed:</i> True'
     else:
-        txt += '<br><i>Inflation Indexed:</i> False'
+        txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Is Inflation Indexed:</i> False'
     if param['integer_value']:
-        txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Integer Value:</i> True'
+        txt += '<br><i>Integer Value:</i> True'
     else:
-        txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Integer Value:</i> False'
+        txt += '<br><i>Integer Value:</i> False'
     if param['boolean_value']:
         txt += '&nbsp;&nbsp;&nbsp;&nbsp; <i>Boolean Value:</i> True'
     else:

diff --git a/taxcalc/behavior.json b/taxcalc/behavior.json
@@ -8,6 +8,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "",
         "col_label": "",
@@ -26,6 +27,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "",
         "col_label": "",
@@ -44,6 +46,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "",
         "col_label": "",
@@ -62,6 +65,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "",
         "col_label": "",
@@ -80,6 +84,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "c00100",
         "col_label": ["AGI < 50k", "50k <= AGI < 100k", "100k <= AGI"],

diff --git a/taxcalc/consumption.json b/taxcalc/consumption.json
@@ -8,6 +8,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "",
         "col_label": "",
@@ -26,6 +27,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "",
         "col_label": "",
@@ -44,6 +46,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "",
         "col_label": "",
@@ -62,6 +65,7 @@
         "row_var": "FLPDYR",
         "row_label": ["2013"],
         "start_year": 2013,
+        "cpi_inflatable": false,
         "cpi_inflated": false,
         "col_var": "",
         "col_label": "",