Fix observations_threshold

openfisca · Aug 11, 2023 · b498e9b · b498e9b
1 parent 2ba7c42
commit b498e9b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/openfisca_survey_manager/scenarios.py b/openfisca_survey_manager/scenarios.py
@@ -356,7 +356,7 @@ def compute_winners_loosers(self, variable = None,
             period = None,
             absolute_minimal_detected_variation = 0,
             relative_minimal_detected_variation = .01,
-            observations_thershold = None,
+            observations_threshold = None,
             weighted = True,
             alternative_weights = None):
 
@@ -370,7 +370,7 @@ def compute_winners_loosers(self, variable = None,
             period = period,
             absolute_minimal_detected_variation = absolute_minimal_detected_variation,
             relative_minimal_detected_variation = relative_minimal_detected_variation,
-            observations_thershold = observations_thershold,
+            observations_threshold = observations_threshold,
             weighted = weighted,
             alternative_weights = alternative_weights,
             filtering_variable_by_entity = self.filtering_variable_by_entity,

diff --git a/openfisca_survey_manager/simulations.py b/openfisca_survey_manager/simulations.py
@@ -525,7 +525,7 @@ def compute_winners_loosers(
         period = None,
         absolute_minimal_detected_variation = 0,
         relative_minimal_detected_variation = .01,
-        observations_thershold = None,
+        observations_threshold = None,
         weighted = True,
         alternative_weights = None,
         filtering_variable_by_entity = None,
@@ -589,8 +589,10 @@ def compute_winners_loosers(
         after_value < absolute_minimal_detected_variation
         )[almost_zero_before]
 
-    if observations_thershold is not None:
-        if ((above_after).sum() < observations_thershold) | ((below_after).sum() < observations_thershold):
+    if observations_threshold is not None:
+        not_legit_below = (below_after.sum() < observations_threshold) & (below_after.sum() > 0)
+        not_legit_above = (above_after.sum() < observations_threshold) & (above_after.sum() > 0)
+        if not_legit_below | not_legit_above:
             raise ValueError("Not enough observations involved")
 
     above_after_count = (above_after * weight).sum()

diff --git a/openfisca_survey_manager/tests/test_compute_winners_loosers.py b/openfisca_survey_manager/tests/test_compute_winners_loosers.py
@@ -17,23 +17,23 @@ def test_compute_winners_loosers():
 
     absolute_minimal_detected_variation = .9
     relative_minimal_detected_variation = .05
-    observations_thershold = 1
+    observations_threshold = 1
 
     below, neutral, above = simulation.compute_winners_loosers(
         baseline_simulation,
         variable,
         period = period,
         absolute_minimal_detected_variation = absolute_minimal_detected_variation,
         relative_minimal_detected_variation = relative_minimal_detected_variation,
-        observations_thershold = observations_thershold,
+        observations_threshold = observations_threshold,
         )
 
     below_scenario, neutral_scenario, above_scenario = survey_scenario.compute_winners_loosers(
         variable,
         period = period,
         absolute_minimal_detected_variation = absolute_minimal_detected_variation,
         relative_minimal_detected_variation = relative_minimal_detected_variation,
-        observations_thershold = observations_thershold,
+        observations_threshold = observations_threshold,
         )
 
     assert (below, neutral, above) == (1, 0, 9)