Updates to fix issue with indexing (#37)
Browse files- Updates to fix issue with indexing (8b2bb5f7bb6c1ba4a2c86d87488bee3989ff1ac8)
Co-authored-by: Warren Borders <wborders@users.noreply.huggingface.co>
plots.py
CHANGED
@@ -54,7 +54,7 @@ def beta(stock_df, choices):
|
|
54 |
|
55 |
|
56 |
def ER(stock_df, choices):
|
57 |
-
symbols, weights,
|
58 |
symbols_ =symbols.copy()
|
59 |
tickers = symbols
|
60 |
tickers.append(benchmark)
|
@@ -155,7 +155,7 @@ def basic_portfolio(stock_df):
|
|
155 |
|
156 |
|
157 |
def display_heat_map(stock_df,choices):
|
158 |
-
symbols, weights,
|
159 |
selected_stocks = stock_df[symbols]
|
160 |
# Calcuilates the correlation of the assets in the portfolio
|
161 |
price_correlation = selected_stocks.corr()
|
@@ -187,7 +187,7 @@ def display_heat_map(stock_df,choices):
|
|
187 |
# st.subheader('Portfolio Historical Cumulative Returns Based On Inputs!')
|
188 |
# st.line_chart(cumulative_profit)
|
189 |
def buble_interactive(stock_df,choices):
|
190 |
-
symbols, weights,
|
191 |
beta,cash_value_weights = ER(stock_df,choices)
|
192 |
my_list = []
|
193 |
my_colors = []
|
|
|
54 |
|
55 |
|
56 |
def ER(stock_df, choices):
|
57 |
+
symbols, weights, benchmark, investing_style, rf, A_coef = choices.values()
|
58 |
symbols_ =symbols.copy()
|
59 |
tickers = symbols
|
60 |
tickers.append(benchmark)
|
|
|
155 |
|
156 |
|
157 |
def display_heat_map(stock_df,choices):
|
158 |
+
symbols, weights, benchmark, investing_style, rf, A_coef = choices.values()
|
159 |
selected_stocks = stock_df[symbols]
|
160 |
# Calcuilates the correlation of the assets in the portfolio
|
161 |
price_correlation = selected_stocks.corr()
|
|
|
187 |
# st.subheader('Portfolio Historical Cumulative Returns Based On Inputs!')
|
188 |
# st.line_chart(cumulative_profit)
|
189 |
def buble_interactive(stock_df,choices):
|
190 |
+
symbols, weights, benchmark, investing_style rf, A_coef = choices.values()
|
191 |
beta,cash_value_weights = ER(stock_df,choices)
|
192 |
my_list = []
|
193 |
my_colors = []
|