diff --git a/ogmys/calibrate.py b/ogmys/calibrate.py index 867644c..a581c65 100644 --- a/ogmys/calibrate.py +++ b/ogmys/calibrate.py @@ -22,7 +22,6 @@ def __init__( client=None, num_workers=1, ): - self.estimate_tax_functions = estimate_tax_functions self.estimate_beta = estimate_beta self.estimate_chi_n = estimate_chi_n diff --git a/ogmys/income.py b/ogmys/income.py index c75df9c..e5d9572 100644 --- a/ogmys/income.py +++ b/ogmys/income.py @@ -149,9 +149,8 @@ def f( # Make sure that values in abil_midp are within interpolating # bounds - if ( - abil_midp.min() < emat_j_midp.min() - or abil_midp.max() > (1- usa_params.lambdas[-1]) + if abil_midp.min() < emat_j_midp.min() or abil_midp.max() > ( + 1 - usa_params.lambdas[-1] ): err = ( "One or more entries in abilities vector (lambdas) is outside the " diff --git a/ogmys/tests/test_income.py b/ogmys/tests/test_income.py index ccbae65..fef5c28 100644 --- a/ogmys/tests/test_income.py +++ b/ogmys/tests/test_income.py @@ -41,8 +41,6 @@ def test_get_e_interp_exception(): Test that RuntimeError is abil_wgts not suitable for interpolation """ age_wgts = np.ones(80) * 1 / 80 - abil_wgts = np.array( - [0.25, 0.25, 0.2, 0.1, 0.1, 0.09, 0.009999, 0.000001] - ) + abil_wgts = np.array([0.25, 0.25, 0.2, 0.1, 0.1, 0.09, 0.009999, 0.000001]) with pytest.raises(RuntimeError): income.get_e_interp(20, 80, 8, abil_wgts, age_wgts)