From c720c5dcf2d541c61ee56ce1bd5caac0f57ea6cb Mon Sep 17 00:00:00 2001 From: Simon Loewe Date: Wed, 3 Jul 2019 10:57:52 +0200 Subject: [PATCH] Adding ETR computations to france-data --- .../erfs_fpr/get_survey_scenario.py | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/openfisca_france_data/erfs_fpr/get_survey_scenario.py b/openfisca_france_data/erfs_fpr/get_survey_scenario.py index a30fe265..ebc9c90f 100644 --- a/openfisca_france_data/erfs_fpr/get_survey_scenario.py +++ b/openfisca_france_data/erfs_fpr/get_survey_scenario.py @@ -19,6 +19,9 @@ def get_survey_scenario( baseline_tax_benefit_system: Optional[TaxBenefitSystem] = None, data: Any = None, # Plusiers formats possibles. reform: Optional[Reform] = None, + use_marginal_tax_rate: bool = False, + variation_factor: float = 0.03, + varying_variable: str = None, ) -> ErfsFprSurveyScenario: """Helper pour créer un :class:`ErfsFprSurveyScenario`. @@ -38,11 +41,21 @@ def get_survey_scenario( baseline_tax_benefit_system, ) - survey_scenario = ErfsFprSurveyScenario.create( - tax_benefit_system = tax_benefit_system, - baseline_tax_benefit_system = baseline_tax_benefit_system, - year = year, - ) + if use_marginal_tax_rate == False: + survey_scenario = ErfsFprSurveyScenario.create( + tax_benefit_system = tax_benefit_system, + baseline_tax_benefit_system = baseline_tax_benefit_system, + year = year, + ) + else: + assert varying_variable is not None, "You need to specify the varying variable." + survey_scenario = ErfsFprSurveyScenario.create( + tax_benefit_system = tax_benefit_system, + baseline_tax_benefit_system = baseline_tax_benefit_system, + year = year, + ) + survey_scenario.variation_factor = variation_factor + survey_scenario.varying_variable = varying_variable # S'il n'y a pas de données, on sait où les trouver. if data is None: @@ -70,6 +83,7 @@ def get_survey_scenario( survey_scenario.init_from_data( data = data, rebuild_input_data = rebuild_input_data, + use_marginal_tax_rate = use_marginal_tax_rate, ) return survey_scenario