format

Author: jdebacker

ogcore/fiscal.py

@@ -87,9 +87,7 @@ def D_G_path(r, dg_fixed_values, p):
         G = p.alpha_G[: p.T] * Y[: p.T]
         D_f = np.zeros(p.T)
         D_d = np.zeros(p.T)
-        r_gov = get_r_gov(
-            r[: p.T + p.S], 0, p, method="TPI"
-        )[:p.T]
+        r_gov = get_r_gov(r[: p.T + p.S], 0, p, method="TPI")[: p.T]
         new_borrowing = np.zeros(p.T)
         debt_service = np.zeros(p.T)
         new_borrowing_f = np.zeros(p.T)
@@ -163,7 +161,9 @@ def D_G_path(r, dg_fixed_values, p):
             - total_tax_revenue[t]
         )
         # find r_gov for the period
-        r_gov[t+1] = get_r_gov(r[t+1], D[t+1] / Y[t+1], p, method="scalar", t=t+1)
+        r_gov[t + 1] = get_r_gov(
+            r[t + 1], D[t + 1] / Y[t + 1], p, method="scalar", t=t + 1
+        )
         D_ratio_max = np.amax(D[: p.T] / Y[: p.T])
         print("Maximum debt ratio: ", D_ratio_max)
 
@@ -381,11 +381,29 @@ def get_r_gov(r, DY_ratio, p, method, t=0):
 
     """
     if method == "SS":
-        r_gov = np.maximum(p.r_gov_scale[-1] * r - p.r_gov_shift[-1] + p.r_gov_DY * DY_ratio  + p.r_gov_DY2 * DY_ratio ** 2, 0.00)
+        r_gov = np.maximum(
+            p.r_gov_scale[-1] * r
+            - p.r_gov_shift[-1]
+            + p.r_gov_DY * DY_ratio
+            + p.r_gov_DY2 * DY_ratio**2,
+            0.00,
+        )
     elif method == "scalar":
-        r_gov = np.maximum(p.r_gov_scale[t] * r - p.r_gov_shift[t] + p.r_gov_DY * DY_ratio  + p.r_gov_DY2 * DY_ratio ** 2, 0.00)
+        r_gov = np.maximum(
+            p.r_gov_scale[t] * r
+            - p.r_gov_shift[t]
+            + p.r_gov_DY * DY_ratio
+            + p.r_gov_DY2 * DY_ratio**2,
+            0.00,
+        )
     else:
-        r_gov = np.maximum(p.r_gov_scale * r - p.r_gov_shift + p.r_gov_DY * DY_ratio  + p.r_gov_DY2 * DY_ratio ** 2, 0.00)
+        r_gov = np.maximum(
+            p.r_gov_scale * r
+            - p.r_gov_shift
+            + p.r_gov_DY * DY_ratio
+            + p.r_gov_DY2 * DY_ratio**2,
+            0.00,
+        )
 
     return r_gov
 

tests/test_fiscal.py

@@ -27,7 +27,9 @@
 D_f1 = df["D_f1"].values
 D_f2 = df["D_f2"].values
 D_f3 = df["D_f3"].values
-r_gov1 = np.ones_like(df["D1"].values) * 0.05 - 0.02  # 0.02 is the default r_gov_shift parameter and the default scale parameter is 1.0, meaning r_gov1 = 0.05 - 0.02 = 0.03
+r_gov1 = (
+    np.ones_like(df["D1"].values) * 0.05 - 0.02
+)  # 0.02 is the default r_gov_shift parameter and the default scale parameter is 1.0, meaning r_gov1 = 0.05 - 0.02 = 0.03
 r_gov2 = r_gov1
 r_gov3 = r_gov1
 nb1 = df["new_borrow1"].values
@@ -275,18 +277,19 @@ def test_get_TR(
         "r_gov_scale": [1.5],
         "r_gov_shift": [0.01],
         "r_gov_DY": 0.01,
-        "r_gov_DY2": 0.001
+        "r_gov_DY2": 0.001,
     }
 )
 p4.r_gov_scale = [1.5]
 p4.r_gov_shift = [0.01]
 r_gov4 = (
-    r * p4.r_gov_scale[0] - p4.r_gov_shift[0] +
-    p4.r_gov_DY * 0.5 + p4.r_gov_DY2 * 0.25
+    r * p4.r_gov_scale[0]
+    - p4.r_gov_shift[0]
+    + p4.r_gov_DY * 0.5
+    + p4.r_gov_DY2 * 0.25
 )
 
 
-
 @pytest.mark.parametrize(
     "r,p,DY_ratio,method,r_gov_expected",
     [
@@ -297,7 +300,14 @@ def test_get_TR(
         (r, p3, 0, "scalar", r_gov3),
         (r, p4, 0.5, "scalar", r_gov4),
     ],
-    ids=["Scale only", "Scale and shift", "r_gov < 0", "TPI", "scalar", "DY params"],
+    ids=[
+        "Scale only",
+        "Scale and shift",
+        "r_gov < 0",
+        "TPI",
+        "scalar",
+        "DY params",
+    ],
 )
 def test_get_r_gov(r, p, DY_ratio, method, r_gov_expected):
     r_gov = fiscal.get_r_gov(r, DY_ratio, p, method, t=0)