Correction function compute_pivot_tables in ReformScenario

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 2.0.4 [#283](https://github.com/openfisca/openfisca-survey-manager/pull/283)
+
+- Correction function compute_pivot_tables in ReformScenario
+
 # 2.0.3 [#282](https://github.com/openfisca/openfisca-survey-manager/pull/282)
 
 - Correction typo error in create_data_frame_by_entity

openfisca_survey_manager/scenarios/reform_scenario.py

@@ -8,6 +8,7 @@
 from openfisca_core.types import Array, Period
 
 from openfisca_survey_manager.scenarios.abstract_scenario import AbstractSurveyScenario
+from openfisca_survey_manager.simulations import Simulation
 
 
 log = logging.getLogger(__name__)
@@ -182,7 +183,9 @@ def compute_pivot_table(self, aggfunc = 'mean', columns = None, difference = Fal
             period = None, use_baseline = False, use_baseline_for_columns = None, values = None,
             missing_variable_default_value = np.nan, concat_axis = None, weighted = True, alternative_weights = None):
 
-        return super(ReformScenario, self).compute_pivot_table(
+        filtering_variable_by_entity = self.filtering_variable_by_entity
+
+        return Simulation.compute_pivot_table(
             aggfunc = aggfunc,
             columns = columns,
             baseline_simulation = self._get_simulation(use_baseline = True),
@@ -193,10 +196,11 @@ def compute_pivot_table(self, aggfunc = 'mean', columns = None, difference = Fal
             difference = difference,
             use_baseline_for_columns = use_baseline_for_columns,
             values = values,
-            missing_variable_default_value = missing_variable_default_value.nan,
+            missing_variable_default_value = missing_variable_default_value,
             concat_axis = concat_axis,
             weighted = weighted,
             alternative_weights = alternative_weights,
+            filtering_variable_by_entity = filtering_variable_by_entity
             )
 
     def compute_winners_loosers(self, variable = None,

openfisca_survey_manager/tests/test_compute_pivot_table.py

@@ -0,0 +1,23 @@
+from openfisca_survey_manager.tests.test_scenario import create_randomly_initialized_survey_scenario
+from openfisca_country_template.reforms.modify_social_security_taxation import modify_social_security_taxation
+
+
+def test_compute_pivot_table():
+    survey_scenario = create_randomly_initialized_survey_scenario(reform = modify_social_security_taxation)
+    period = "2017-01"
+
+    return survey_scenario.compute_pivot_table(
+        aggfunc = "mean",
+        columns = ['age'],
+        difference = False,
+        filter_by = None,
+        index = None,
+        period = period,
+        use_baseline = True,
+        use_baseline_for_columns = True,
+        values = ['salary'],
+        missing_variable_default_value = 0,
+        concat_axis = None,
+        weighted = True,
+        alternative_weights = None,
+        )

setup.py

@@ -30,7 +30,7 @@
 
 setup(
     name = 'OpenFisca-Survey-Manager',
-    version = '2.0.3',
+    version = '2.0.4',
     author = 'OpenFisca Team',
     author_email = '[email protected]',
     classifiers = [classifier for classifier in classifiers.split('\n') if classifier],