Apply formatting

jdebacker · Jul 28, 2021 · 63b447f · 63b447f
1 parent fcc65d4
commit 63b447f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 17 deletions.
diff --git a/openfisca_uk/graphs/general.py b/openfisca_uk/graphs/general.py
@@ -39,15 +39,17 @@ def formalise_column_names(df: pd.DataFrame) -> pd.DataFrame:
 
 
 def net_cost(
-    baseline_sim: Microsimulation, reform_sim: Microsimulation, invert: bool = False, variable: str = "net_income"
+    baseline_sim: Microsimulation,
+    reform_sim: Microsimulation,
+    invert: bool = False,
+    variable: str = "net_income",
 ) -> float:
     if invert:
         multiplier = -1
     else:
         multiplier = 1
     return multiplier * (
-        reform_sim.calc(variable).sum()
-        - baseline_sim.calc(variable).sum()
+        reform_sim.calc(variable).sum() - baseline_sim.calc(variable).sum()
     )
 
 

diff --git a/openfisca_uk/graphs/population.py b/openfisca_uk/graphs/population.py
@@ -196,7 +196,12 @@ def waterfall_data(
         net_costs = []
         for i in range(len(reform) + 1):
             net_costs += [
-                net_cost(baseline, Microsimulation(reform[:i], **kwargs), invert=invert_y, variable=aggregate)
+                net_cost(
+                    baseline,
+                    Microsimulation(reform[:i], **kwargs),
+                    invert=invert_y,
+                    variable=aggregate,
+                )
             ]
         net_costs = np.array(net_costs)
         labels = subreform_labels + ["Remaining"]
@@ -241,7 +246,7 @@ def waterfall_chart(
     reform_labels: List[str] = None,
     baseline: Microsimulation = None,
     aggregate: str = "net_income",
-    invert_y: bool = False
+    invert_y: bool = False,
 ):
     """Generates a waterfull funding breakdown plot.
 
@@ -262,7 +267,12 @@ def waterfall_chart(
 
     return px.bar(
         waterfall_data(
-            reforms, reform_labels, subreform_labels, baseline=baseline, aggregate=aggregate, invert_y=invert_y, 
+            reforms,
+            reform_labels,
+            subreform_labels,
+            baseline=baseline,
+            aggregate=aggregate,
+            invert_y=invert_y,
         ),
         x="component",
         y="amount",

diff --git a/openfisca_uk/tools/simulation.py b/openfisca_uk/tools/simulation.py
@@ -407,12 +407,18 @@ def deriv(
                     dataset=self.dataset,
                     year=self.year,
                 )
-                original_values = self.bonus_sims[config].calc(wrt, self.year).values
+                original_values = (
+                    self.bonus_sims[config].calc(wrt, self.year).values
+                )
                 if not percent:
-                    self.bonus_sims[config].simulation.set_input(wrt, self.year, original_values + delta)
+                    self.bonus_sims[config].simulation.set_input(
+                        wrt, self.year, original_values + delta
+                    )
                 else:
-                    self.bonus_sims[config].simulation.set_input(wrt, self.year, original_values * (1 + delta))
-
+                    self.bonus_sims[config].simulation.set_input(
+                        wrt, self.year, original_values * (1 + delta)
+                    )
+
             bonus_sim = self.bonus_sims[config]
             bonus_increase = bonus_sim.calc(wrt).astype(float) - self.calc(
                 wrt
@@ -439,25 +445,35 @@ def deriv(
 
             derivative = np.empty((len(adult))) * np.nan
 
-            for i in range(
-                max_group_size
-            ):
+            for i in range(max_group_size):
                 config = (wrt, delta, percent, "group-entity", i)
                 if config not in self.bonus_sims:
                     self.bonus_sims[config] = Microsimulation(
                         self.passed_reforms,
                         dataset=self.dataset,
                         year=self.year,
                     )
-                    original_values = self.bonus_sims[config].calc(wrt, self.year).values
+                    original_values = (
+                        self.bonus_sims[config].calc(wrt, self.year).values
+                    )
                     existing_var_class = system.variables[wrt].__class__
 
                     altered_variable = type(wrt, (existing_var_class,), {})
                     if not percent:
-                        self.bonus_sims[config].simulation.set_input(wrt, self.year, original_values + delta * (index_in_group == i) * adult)
+                        self.bonus_sims[config].simulation.set_input(
+                            wrt,
+                            self.year,
+                            original_values
+                            + delta * (index_in_group == i) * adult,
+                        )
                     else:
-                        self.bonus_sims[config].simulation.set_input(wrt, self.year, original_values * (1 + delta * (index_in_group == i) * adult))
-
+                        self.bonus_sims[config].simulation.set_input(
+                            wrt,
+                            self.year,
+                            original_values
+                            * (1 + delta * (index_in_group == i) * adult),
+                        )
+
                 bonus_sim = self.bonus_sims[config]
                 bonus_increase = bonus_sim.calc(wrt).astype(float) - self.calc(
                     wrt