diff --git a/taxcalc.egg-info/PKG-INFO b/taxcalc.egg-info/PKG-INFO index b93fe2de9..59007e8e1 100644 --- a/taxcalc.egg-info/PKG-INFO +++ b/taxcalc.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: taxcalc -Version: 4.3.0 +Version: 4.3.1 Summary: taxcalc Home-page: https://github.com/PSLmodels/Tax-Calculator Download-URL: https://github.com/PSLmodels/Tax-Calculator diff --git a/taxcalc/calculator.py b/taxcalc/calculator.py index af2abbd84..353d09959 100644 --- a/taxcalc/calculator.py +++ b/taxcalc/calculator.py @@ -698,7 +698,8 @@ def mtr(self, variable_str='e00200p', self.policy_param('FICA_ss_trt_employee') + self.policy_param('FICA_mc_trt_employer') + self.policy_param('FICA_mc_trt_employee')), - 0.5 * (self.policy_param('FICA_mc_trt_employer') + self.policy_param('FICA_mc_trt_employee'))) + 0.5 * (self.policy_param('FICA_mc_trt_employer') + + self.policy_param('FICA_mc_trt_employee'))) else: adj = 0.0 # compute marginal tax rates @@ -1189,11 +1190,10 @@ def lines(text, num_indent_spaces, max_line_length=77): for pname in baseline.keys(): upda_value = getattr(updated, pname) base_value = getattr(baseline, pname) + is_array = isinstance(upda_value, np.ndarray) if ( - (isinstance(upda_value, np.ndarray) and - np.allclose(upda_value, base_value)) or - (not isinstance(upda_value, np.ndarray) and - upda_value != base_value) + (is_array and not np.allclose(upda_value, base_value)) + or (is_array == False and upda_value != base_value) ): params_with_diff.append(pname) if params_with_diff: diff --git a/taxcalc/growfactors.py b/taxcalc/growfactors.py index 336d8ae74..8be68f1fb 100644 --- a/taxcalc/growfactors.py +++ b/taxcalc/growfactors.py @@ -38,7 +38,7 @@ class instance: GrowFactors which is for use with puf and cps data from the taxdata repository. """ - PACKAGE_FILE_NAMES = ['growfactors.csv', 'tmd_growfactors.csv'] + PACKAGE_FILE_NAMES = ['growfactors.csv'] FILE_PATH = os.path.abspath(os.path.dirname(__file__)) VALID_NAMES = set(['ABOOK', 'ACGNS', 'ACPIM', 'ACPIU',