Commit 382d8a97 authored by Dr.李's avatar Dr.李

fixed bug for long short portfolio

parent a0c519e7
...@@ -140,7 +140,7 @@ class FDataPack(object): ...@@ -140,7 +140,7 @@ class FDataPack(object):
return factor_processing(self.raw_factors, return factor_processing(self.raw_factors,
pre_process, pre_process,
pos_process, pos_process,
do_neutralize) do_neutralize=do_neutralize)
else: else:
return factor_processing(self.raw_factors, return factor_processing(self.raw_factors,
pre_process, pre_process,
...@@ -225,6 +225,9 @@ def factor_analysis(factors: pd.DataFrame, ...@@ -225,6 +225,9 @@ def factor_analysis(factors: pd.DataFrame,
weights = build_portfolio(er, weights = build_portfolio(er,
builder='rank', builder='rank',
**kwargs) / kwargs['use_rank'] **kwargs) / kwargs['use_rank']
elif method == 'ls' or method == 'long_short':
weights = build_portfolio(er,
builder=method)
if detail_analysis: if detail_analysis:
analysis = data_pack.settle(weights, d1returns) analysis = data_pack.settle(weights, d1returns)
......
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