From 420b81575b6fdffbcd0ea65244169462e05dd1e1 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 22 Apr 2024 14:25:41 -0400 Subject: [PATCH] remove unused args and refs to Tax-Calculator --- ogcore/txfunc.py | 12 +----------- tests/test_txfunc.py | 3 --- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/ogcore/txfunc.py b/ogcore/txfunc.py index 42a568816..ac0990b1d 100644 --- a/ogcore/txfunc.py +++ b/ogcore/txfunc.py @@ -1,6 +1,6 @@ """ ------------------------------------------------------------------------ -This script reads in data generated from the Tax Calculator model. +This script reads in data generated from a tax-benefit microsimulation model. It then estimates tax functions tau_{s,t}(x,y), where tau_{s,t} is the effective tax rate, marginal tax rate on labor income, or the marginal tax rate on capital income, for a given age (s) in a @@ -1388,12 +1388,9 @@ def tax_func_estimate( starting_age, ending_age, start_year=DEFAULT_START_YEAR, - baseline=True, analytical_mtrs=False, tax_func_type="DEP", age_specific=False, - reform={}, - data=None, desc_data=False, graph_data=False, graph_est=False, @@ -1416,16 +1413,12 @@ def tax_func_estimate( starting_age (int): minimum age to estimate tax functions for ending_age (int): maximum age to estimate tax functions for start_yr (int): first year of budget window - baseline (bool): whether these are the baseline tax functions analytical_mtrs (bool): whether to use the analytical derivation of the marginal tax rates (and thus only need to estimate the effective tax rate functions) tax_func_type (str): functional form of tax functions age_specific (bool): whether to estimate age specific tax functions - reform (dict): policy reform dictionary for Tax-Calculator - data (str or Pandas DataFrame): path to or data to use in - Tax-Calculator client (Dask client object): client num_workers (int): number of workers to use for parallelization with Dask @@ -1479,9 +1472,6 @@ def tax_func_estimate( # -------------------------------------------------------------------- # start_time = scalar, current processor time in seconds (float) # output_dir = string, directory to which plots will be saved - # micro_data = dictionary, BW (one for each year) DataFrames, - # each of which has variables with observations from - # Tax-Calculator # t = integer >= start_year, index for year of analysis # -------------------------------------------------------------------- # ''' diff --git a/tests/test_txfunc.py b/tests/test_txfunc.py index f4d76e966..40afe7961 100644 --- a/tests/test_txfunc.py +++ b/tests/test_txfunc.py @@ -688,12 +688,9 @@ def test_tax_func_estimate(tmpdir, dask_client): starting_age, ending_age, start_year=2030, - baseline=baseline, analytical_mtrs=analytical_mtrs, tax_func_type=tax_func_type, age_specific=age_specific, - reform=reform, - data=data, client=dask_client, num_workers=NUM_WORKERS, tax_func_path=test_path,