Spaces:
Running
Running
RobertCastagna
commited on
Commit
•
6fe5328
1
Parent(s):
f6f61ac
Update pages/1_Fundamentals.py
Browse files- pages/1_Fundamentals.py +2 -2
pages/1_Fundamentals.py
CHANGED
@@ -157,7 +157,7 @@ with st.form(key="selecting columns"):
|
|
157 |
|
158 |
|
159 |
# Now, create a DataFrame from the hash_map
|
160 |
-
df_1 = pd.DataFrame.from_dict(hash_map, orient='index')[['finnhubIndustry','beta','pe','ps','pb','pfcf','eps','roe','roeTTM','dividendGrowthRate5Y','epsGrowth5Y'
|
161 |
df_2 = pd.DataFrame.from_dict(gains_data, orient='index', columns=['Recent Dividend','Price'])
|
162 |
|
163 |
df_final = df_1.join(df_2)
|
@@ -168,7 +168,7 @@ with st.form(key="selecting columns"):
|
|
168 |
df_final['dividendGrowthRate5Y'] = df_final['dividendGrowthRate5Y']/100
|
169 |
df_final['CAPM'] = df_final['90_day_tbill']/100 + df_final['beta']*(df_final['5Y_SP500_growth'] - df_final['90_day_tbill']/100)
|
170 |
df_final['DDM'] = (df_final['Recent Dividend'] * (1+df_final['dividendGrowthRate5Y'])) / (df_final['CAPM'] - df_final['dividendGrowthRate5Y'])
|
171 |
-
df_final = df_final[['finnhubIndustry','Price','eps','roe','roeTTM','pe','ps','pb','pfcf','epsGrowth5Y','
|
172 |
df_final.rename({'finnhubIndustry':'Industry', 'eps':'EPS', 'roe':'ROE','pe':'P/E','ps':'P/S', 'pb':'P/B','pfcf':'P/FCF','beta':'Beta'}, inplace=True, axis=1)
|
173 |
st.write(df_final)
|
174 |
|
|
|
157 |
|
158 |
|
159 |
# Now, create a DataFrame from the hash_map
|
160 |
+
df_1 = pd.DataFrame.from_dict(hash_map, orient='index')[['finnhubIndustry','beta','pe','ps','pb','pfcf','eps','roe','roeTTM','dividendGrowthRate5Y','epsGrowth5Y']]
|
161 |
df_2 = pd.DataFrame.from_dict(gains_data, orient='index', columns=['Recent Dividend','Price'])
|
162 |
|
163 |
df_final = df_1.join(df_2)
|
|
|
168 |
df_final['dividendGrowthRate5Y'] = df_final['dividendGrowthRate5Y']/100
|
169 |
df_final['CAPM'] = df_final['90_day_tbill']/100 + df_final['beta']*(df_final['5Y_SP500_growth'] - df_final['90_day_tbill']/100)
|
170 |
df_final['DDM'] = (df_final['Recent Dividend'] * (1+df_final['dividendGrowthRate5Y'])) / (df_final['CAPM'] - df_final['dividendGrowthRate5Y'])
|
171 |
+
df_final = df_final[['finnhubIndustry','Price','eps','roe','roeTTM','pe','ps','pb','pfcf','epsGrowth5Y','beta','Recent Dividend','90_day_tbill','5Y_SP500_growth','dividendGrowthRate5Y','CAPM','DDM']]
|
172 |
df_final.rename({'finnhubIndustry':'Industry', 'eps':'EPS', 'roe':'ROE','pe':'P/E','ps':'P/S', 'pb':'P/B','pfcf':'P/FCF','beta':'Beta'}, inplace=True, axis=1)
|
173 |
st.write(df_final)
|
174 |
|