Merge pull request #120 from jdebacker/benefits_totals

Adding benefits totals to aggregate table
PSLmodels · Jun 24, 2020 · d1f66ba · d1f66ba
2 parents dfe852e + a4a708a
commit d1f66ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/cs-config/cs_config/constants.py b/cs-config/cs_config/constants.py
@@ -46,7 +46,8 @@
  }
 }
 
-AGG_ROW_NAMES = ['ind_tax', 'payroll_tax', 'combined_tax']
+AGG_ROW_NAMES = ['ind_tax', 'payroll_tax', 'combined_tax',
+ 'benefit_cost_total']
 
 RESULTS_TABLE_TITLES = {
  'diff_comb_xbin': ('Combined Payroll and Individual Income Tax: Difference'
@@ -103,10 +104,11 @@
  'gdp_effect': {'default': 'gdp_elast'}
 }
 RESULTS_TOTAL_ROW_KEY_LABELS = {
- 'ind_tax': 'Individual Income Tax Liability Change',
- 'payroll_tax': 'Payroll Tax Liability Change',
- 'combined_tax': ('Combined Payroll and Individual Income Tax Liability '
- 'Change'),
+ 'ind_tax': 'Individual Income Tax Liability',
+ 'payroll_tax': 'Payroll Tax Liability',
+ 'combined_tax': ('Combined Payroll and Individual Income Tax ' +
+ 'Liability'),
+ 'benefit_cost_total': 'Total Benefits Spending',
 }
 
 MONEY_VARS = {

diff --git a/cs-config/cs_config/tables.py b/cs-config/cs_config/tables.py
@@ -18,7 +18,8 @@ def summary_aggregate(res, tb):
  f"'tb' is of type {type(tb)}. Must be TaxBrain object"
  )
  # tax totals for baseline
- tax_vars = ["iitax", "payrolltax", "combined"]
+ tax_vars = ["iitax", "payrolltax", "combined",
+ "benefit_cost_total"]
  aggr_base = tb.multi_var_table(tax_vars, "base")
  aggr_base.index = AGG_ROW_NAMES
  # tax totals for reform