Spaces:
Sleeping
Sleeping
Joseph Spada
commited on
Commit
·
8cb462a
1
Parent(s):
677e6fc
fixed graphing
Browse files
app.py
CHANGED
@@ -62,9 +62,6 @@ def plot_interest_coverage(interest_rate, cagr_revenues, cagr_ssoasdi_revenues):
|
|
62 |
# add a baseline net interest / revenues ex SS OASDI column
|
63 |
data["Net Interest / Revenues ex SS OASDI (Baseline)"] = data["Net Interest"] / data["Revenues ex SS OASDI"]
|
64 |
|
65 |
-
# add a baseline SS OASDI revenues column
|
66 |
-
# data["SS OASDI Revenues"] = data["Total Revenues"] - data["Revenues ex SS OASDI"]
|
67 |
-
|
68 |
# add a projected average rate on federal debt column
|
69 |
data["Average Rate on Federal Debt (Projected)"] = np.where(
|
70 |
data.index.astype(int) < 2025,
|
@@ -83,26 +80,15 @@ def plot_interest_coverage(interest_rate, cagr_revenues, cagr_ssoasdi_revenues):
|
|
83 |
data["SS OASDI Revenues"],
|
84 |
data["SS OASDI Revenues"] + (ssoasdi_revenues_yearly_increase * (data.index.astype(int) - 2024)))
|
85 |
|
86 |
-
# add a projected revenues column
|
87 |
-
#data["Total Revenues (Projected)"] = np.where(
|
88 |
-
#data.index.astype(int) < 2025,
|
89 |
-
#data["Total Revenues"],
|
90 |
-
#data["Total Revenues"] + (revenues_yearly_increase * (data.index.astype(int) - 2024)))
|
91 |
-
|
92 |
# add a projected revenues column
|
93 |
data["Total Revenues (Projected)"] = data["Revenues ex SS OASDI (Projected)"] + data["SS OASDI Revenues (Projected)"]
|
94 |
-
|
95 |
-
#print(data.loc[2055, "Total Revenues (Projected)"])
|
96 |
-
|
97 |
# add a projected interest / revenues column
|
98 |
data["Net Interest / Revenues (Projected)"] = np.where(
|
99 |
data.index.astype(int) < 2025,
|
100 |
data["Net Interest / Revenues (Baseline)"],
|
101 |
data["Average Rate on Federal Debt (Projected)"] * data["Debt Balance"] / data["Total Revenues (Projected)"])
|
102 |
|
103 |
-
#print(data.loc[2055, "Net Interest / Revenues (Baseline)"])
|
104 |
-
#print(data.loc[2055, "Net Interest / Revenues (Projected)"])
|
105 |
-
|
106 |
# add a projected interest / revenues ex SS OASDI column
|
107 |
data["Net Interest / Revenues ex SS OASDI (Projected)"] = np.where(
|
108 |
data.index.astype(int) < 2025,
|
@@ -119,7 +105,7 @@ def plot_interest_coverage(interest_rate, cagr_revenues, cagr_ssoasdi_revenues):
|
|
119 |
label = "Average Rate on Federal Debt"
|
120 |
)
|
121 |
# plot average rate on federal debt projected
|
122 |
-
if cagr_revenues != baseline_cagr_revenues or interest_rate != baseline_interest_rate:
|
123 |
plt.plot(
|
124 |
data.index,
|
125 |
data["Average Rate on Federal Debt (Projected)"],
|
@@ -143,16 +129,25 @@ def plot_interest_coverage(interest_rate, cagr_revenues, cagr_ssoasdi_revenues):
|
|
143 |
color = "Blue",
|
144 |
label = "Net Interest / Revenues (Baseline)"
|
145 |
)
|
|
|
146 |
# plot interest / revenues (projected)
|
147 |
-
|
|
|
148 |
data.index,
|
149 |
data["Net Interest / Revenues (Projected)"],
|
150 |
color = "Blue",
|
151 |
label = "Net Interest / Revenues (Projected)",
|
152 |
linestyle = "--"
|
153 |
)
|
154 |
-
|
155 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
156 |
# plot interest / revenues ex ss oasdi (baseline)
|
157 |
plt.plot(
|
158 |
data.index,
|
@@ -161,13 +156,24 @@ def plot_interest_coverage(interest_rate, cagr_revenues, cagr_ssoasdi_revenues):
|
|
161 |
label = "Net Interest / Revenues ex SS OASDI (Baseline)"
|
162 |
)
|
163 |
# plot interest / revenues ex ss oasdi (projected)
|
164 |
-
|
|
|
|
|
165 |
data.index,
|
166 |
data["Net Interest / Revenues ex SS OASDI (Projected)"],
|
167 |
color = "Orange",
|
168 |
label = "Net Interest / Revenues ex SS OASDI (Projected)",
|
169 |
linestyle = "--"
|
170 |
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
171 |
|
172 |
plt.title("Interest as Share of Revenues Through 2055")
|
173 |
plt.legend(loc = "upper left")
|
@@ -205,7 +211,7 @@ with gr.Blocks() as interface:
|
|
205 |
interest_rate_slider = gr.Slider(
|
206 |
interest_rate_lowerbound,
|
207 |
interest_rate_upperbound,
|
208 |
-
step = .
|
209 |
value = baseline_interest_rate,
|
210 |
label = "2055 Projected Average Interest Rate on Federal Debt"
|
211 |
)
|
|
|
62 |
# add a baseline net interest / revenues ex SS OASDI column
|
63 |
data["Net Interest / Revenues ex SS OASDI (Baseline)"] = data["Net Interest"] / data["Revenues ex SS OASDI"]
|
64 |
|
|
|
|
|
|
|
65 |
# add a projected average rate on federal debt column
|
66 |
data["Average Rate on Federal Debt (Projected)"] = np.where(
|
67 |
data.index.astype(int) < 2025,
|
|
|
80 |
data["SS OASDI Revenues"],
|
81 |
data["SS OASDI Revenues"] + (ssoasdi_revenues_yearly_increase * (data.index.astype(int) - 2024)))
|
82 |
|
|
|
|
|
|
|
|
|
|
|
|
|
83 |
# add a projected revenues column
|
84 |
data["Total Revenues (Projected)"] = data["Revenues ex SS OASDI (Projected)"] + data["SS OASDI Revenues (Projected)"]
|
85 |
+
|
|
|
|
|
86 |
# add a projected interest / revenues column
|
87 |
data["Net Interest / Revenues (Projected)"] = np.where(
|
88 |
data.index.astype(int) < 2025,
|
89 |
data["Net Interest / Revenues (Baseline)"],
|
90 |
data["Average Rate on Federal Debt (Projected)"] * data["Debt Balance"] / data["Total Revenues (Projected)"])
|
91 |
|
|
|
|
|
|
|
92 |
# add a projected interest / revenues ex SS OASDI column
|
93 |
data["Net Interest / Revenues ex SS OASDI (Projected)"] = np.where(
|
94 |
data.index.astype(int) < 2025,
|
|
|
105 |
label = "Average Rate on Federal Debt"
|
106 |
)
|
107 |
# plot average rate on federal debt projected
|
108 |
+
if cagr_revenues != baseline_cagr_revenues or interest_rate != baseline_interest_rate or cagr_ssoasdi_revenues != baseline_cagr_ssoasdi_revenues:
|
109 |
plt.plot(
|
110 |
data.index,
|
111 |
data["Average Rate on Federal Debt (Projected)"],
|
|
|
129 |
color = "Blue",
|
130 |
label = "Net Interest / Revenues (Baseline)"
|
131 |
)
|
132 |
+
|
133 |
# plot interest / revenues (projected)
|
134 |
+
if cagr_revenues != baseline_cagr_revenues or interest_rate != baseline_interest_rate or cagr_ssoasdi_revenues != baseline_cagr_ssoasdi_revenues:
|
135 |
+
plt.plot(
|
136 |
data.index,
|
137 |
data["Net Interest / Revenues (Projected)"],
|
138 |
color = "Blue",
|
139 |
label = "Net Interest / Revenues (Projected)",
|
140 |
linestyle = "--"
|
141 |
)
|
142 |
+
else:
|
143 |
+
plt.plot(
|
144 |
+
data.index,
|
145 |
+
data["Net Interest / Revenues (Baseline)"],
|
146 |
+
color = "Blue",
|
147 |
+
label = "Net Interest / Revenues (Projected)",
|
148 |
+
linestyle = "--"
|
149 |
+
)
|
150 |
+
|
151 |
# plot interest / revenues ex ss oasdi (baseline)
|
152 |
plt.plot(
|
153 |
data.index,
|
|
|
156 |
label = "Net Interest / Revenues ex SS OASDI (Baseline)"
|
157 |
)
|
158 |
# plot interest / revenues ex ss oasdi (projected)
|
159 |
+
# plot interest / revenues (projected)
|
160 |
+
if cagr_revenues != baseline_cagr_revenues or interest_rate != baseline_interest_rate or cagr_ssoasdi_revenues != baseline_cagr_ssoasdi_revenues:
|
161 |
+
plt.plot(
|
162 |
data.index,
|
163 |
data["Net Interest / Revenues ex SS OASDI (Projected)"],
|
164 |
color = "Orange",
|
165 |
label = "Net Interest / Revenues ex SS OASDI (Projected)",
|
166 |
linestyle = "--"
|
167 |
)
|
168 |
+
else:
|
169 |
+
plt.plot(
|
170 |
+
data.index,
|
171 |
+
data["Net Interest / Revenues ex SS OASDI (Baseline)"],
|
172 |
+
color = "Orange",
|
173 |
+
label = "Net Interest / Revenues ex SS OASDI (Projected)",
|
174 |
+
linestyle = "--"
|
175 |
+
)
|
176 |
+
|
177 |
|
178 |
plt.title("Interest as Share of Revenues Through 2055")
|
179 |
plt.legend(loc = "upper left")
|
|
|
211 |
interest_rate_slider = gr.Slider(
|
212 |
interest_rate_lowerbound,
|
213 |
interest_rate_upperbound,
|
214 |
+
step = .01,
|
215 |
value = baseline_interest_rate,
|
216 |
label = "2055 Projected Average Interest Rate on Federal Debt"
|
217 |
)
|