alihan/PyPortfolioOpt
1
0
Fork 0
mirror of https://github.com/robertmartin8/PyPortfolioOpt.git synced 2022-11-27 18:02:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #467 from duranvrNubank/patch-1

Browse Source 
Add check to `market_prices`
This commit is contained in:
Robert Martin
2022-11-26 10:30:20 -05:00
committed by GitHub
parent 7d1c82553d 310d12ac9e
commit 147a36c745
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pypfopt/expected_returns.py
View File

@@ -247,7 +247,12 @@ def capm_return(
market_returns = market_prices market_returns = market_prices
else: else:
returns = returns_from_prices(prices, log_returns) returns = returns_from_prices(prices, log_returns)
if market_prices is not None: if market_prices is not None:
if not isinstance(market_prices, pd.DataFrame):
warnings.warn("market prices are not in a dataframe", RuntimeWarning)
market_prices = pd.DataFrame(market_prices)
market_returns = returns_from_prices(market_prices, log_returns) market_returns = returns_from_prices(market_prices, log_returns)
# Use the equally-weighted dataset as a proxy for the market # Use the equally-weighted dataset as a proxy for the market
if market_returns is None: if market_returns is None: