Skip to content

A
alpha-mind
Commit 8b061a73 authored by Dr.李's avatar Dr.李
Browse files
Options

update er analysis

parent 6b3f0a38
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
alphamind/analysis/factoranalysis.py
View file @ 8b061a73
......@@ -112,7 +112,7 @@ def er_portfolio_analysis(er: np.ndarray,
weights = long_short_builder(er).flatten()
elif method == 'mv' or method == 'mean_variance':
lbound, ubound, cons_exp, risk_lbound, risk_ubound = create_constraints(benchmark, **kwargs)
cov = kwargs['cov']
risk_model = kwargs['risk_model']
if 'lam' in kwargs:
lam = kwargs['lam']
......@@ -120,7 +120,7 @@ def er_portfolio_analysis(er: np.ndarray,
lam = 1.
status, _, weights = mean_variance_builder(er,
cov=cov,
risk_model=risk_model,
bm=benchmark,
lbound=lbound,
ubound=ubound,
......@@ -132,7 +132,7 @@ def er_portfolio_analysis(er: np.ndarray,
elif method == 'tv' or method == 'target_vol':
lbound, ubound, cons_exp, risk_lbound, risk_ubound = create_constraints(benchmark, **kwargs)
cov = kwargs['cov']
risk_model = kwargs['risk_model']
if 'target_vol' in kwargs:
target_vol = kwargs['target_vol']
......@@ -140,14 +140,13 @@ def er_portfolio_analysis(er: np.ndarray,
target_vol = 1.
status, _, weights = target_vol_builder(er,
cov=cov,
risk_model=risk_model,
bm=benchmark,
lbound=lbound,
ubound=ubound,
risk_exposure=cons_exp,
risk_target=(risk_lbound, risk_ubound),
vol_low=0,
vol_high=target_vol)
vol_target=target_vol)
else:
raise ValueError("Unknown building type ({0})".format(method))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment