Merge pull request #286 from openfisca/ponderations-compute-aggregate

Améliore la gestion des poids dans compute_aggregate

openfisca_survey_manager/simulations.py

@@ -184,11 +184,24 @@ def compute_aggregate(simulation: Simulation, variable: str = None, aggfunc: str
     if variable in simulation.tax_benefit_system.variables:
         value = simulation.adaptative_calculate_variable(variable = variable, period = period)
     else:
-        log.debug("Variable {} not found. Assiging {}".format(variable, missing_variable_default_value))
+        log.debug("Variable {} not found. Assigning {}".format(variable, missing_variable_default_value))
         return missing_variable_default_value
 
+    # The following lines allow for under-yearly weighted aggregates even if weights are annual
+    if weighted and weight_variable is not None:
+        period_size_independent_weight = tax_benefit_system.get_variable(weight_variable).is_period_size_independent
+        definition_period_weight = tax_benefit_system.get_variable(weight_variable).definition_period
+        if not isinstance(period, periods.Period):
+            period = periods.period(str(period))
+        if period_size_independent_weight is True and definition_period_weight == 'year' and period.start.year == period.stop.year:
+            period_computation_weights = period.this_year
+        else:
+            period_computation_weights = period
+    else:
+        period_computation_weights = period
+
     weight = (
-        simulation.calculate(weight_variable, period = period).astype(float)
+        simulation.calculate(weight_variable, period = period_computation_weights).astype(float)
         if weight_variable else uniform_weight
         )
     if weight_variable: