Variable uprating caused nan (#235)

* fix bug where if a variable existed for a period after the current period, uprating would cause the variable to become nan * changelog entry
PolicyEngine · Aug 8, 2024 · 0deeb02 · 0deeb02
1 parent ad46383
commit 0deeb02
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 34 deletions.
diff --git a/changelog_entry.yaml b/changelog_entry.yaml
@@ -0,0 +1,4 @@
+- bump: patch
+  changes:
+    fixed:
+      - fixed bug where uprating was causing nan.
diff --git a/policyengine_core/simulations/simulation.py b/policyengine_core/simulations/simulation.py
@@ -668,43 +668,40 @@ def _calculate(
             if array is None:
                 # Check if the variable has a previously defined value
                 known_periods = holder.get_known_periods()
-                if variable.uprating is not None and len(known_periods) > 0:
-                    start_instants = [
-                        str(known_period.start)
-                        for known_period in known_periods
-                        if known_period.unit == variable.definition_period
-                        and known_period.start < period.start
+                start_instants = [
+                    str(known_period.start)
+                    for known_period in known_periods
+                    if known_period.unit == variable.definition_period
+                    and known_period.start < period.start
+                ]
+                if variable.uprating is not None and len(start_instants) > 0:
+                    latest_known_period = known_periods[
+                        np.argmax(start_instants)
                     ]
-                    if len(start_instants) > 0:
-                        latest_known_period = known_periods[
-                            np.argmax(start_instants)
-                        ]
-                        try:
-                            uprating_parameter = get_parameter(
-                                self.tax_benefit_system.parameters,
-                                variable.uprating,
-                            )
-                        except:
-                            raise ValueError(
-                                f"Could not find uprating parameter {variable.uprating} when trying to uprate {variable_name}."
-                            )
-                        value_in_last_period = uprating_parameter(
-                            latest_known_period.start
+                    try:
+                        uprating_parameter = get_parameter(
+                            self.tax_benefit_system.parameters,
+                            variable.uprating,
                         )
-                        value_in_this_period = uprating_parameter(period.start)
-                        if value_in_last_period == 0:
-                            uprating_factor = 1
-                        else:
-                            uprating_factor = (
-                                value_in_this_period / value_in_last_period
-                            )
-
-                        array = (
-                            holder.get_array(
-                                latest_known_period, self.branch_name
-                            )
-                            * uprating_factor
+                    except:
+                        raise ValueError(
+                            f"Could not find uprating parameter {variable.uprating} when trying to uprate {variable_name}."
                         )
+                    value_in_last_period = uprating_parameter(
+                        latest_known_period.start
+                    )
+                    value_in_this_period = uprating_parameter(period.start)
+                    if value_in_last_period == 0:
+                        uprating_factor = 1
+                    else:
+                        uprating_factor = (
+                            value_in_this_period / value_in_last_period
+                        )
+
+                    array = (
+                        holder.get_array(latest_known_period, self.branch_name)
+                        * uprating_factor
+                    )
                 elif (
                     self.tax_benefit_system.auto_carry_over_input_variables
                     and variable.calculate_output is None