Commit b4974223 authored by 吕先亚's avatar 吕先亚

bugfix 回报日期不含当天

parent 723fa04a
...@@ -64,10 +64,10 @@ def judgement(id, type, predict): ...@@ -64,10 +64,10 @@ def judgement(id, type, predict):
start = parse_date(max_date) if max_date else prev_workday(datetime.today()) start = parse_date(max_date) if max_date else prev_workday(datetime.today())
navs = [] navs = []
if type == 'INDEX': if type == 'INDEX':
navs = get_index_list(index_ids=id, min_date=start, limit=predict_term) navs = get_index_list(index_ids=id, min_date=start, limit=predict_term + 1)
navs = [nav['rid_close'] for nav in navs] navs = [nav['rid_close'] for nav in navs]
elif type == 'FUND': elif type == 'FUND':
navs = get_fund_list(fund_ids=id, min_date=start, limit=predict_term) navs = get_fund_list(fund_ids=id, min_date=start, limit=predict_term + 1)
navs = [nav['rfn_nav_cal'] for nav in navs] navs = [nav['rfn_nav_cal'] for nav in navs]
if len(navs) == predict_term: if len(navs) == predict_term:
upper = True if navs[-1] >= navs[0] else False upper = True if navs[-1] >= navs[0] else False
......
...@@ -102,10 +102,10 @@ def is_right(id, type, start, predict): ...@@ -102,10 +102,10 @@ def is_right(id, type, start, predict):
predict_term = 21 predict_term = 21
navs = [] navs = []
if type == 'INDEX': if type == 'INDEX':
navs = get_index_list(index_ids=id, min_date=start, limit=predict_term) navs = get_index_list(index_ids=id, min_date=start, limit=predict_term + 1)
navs = [nav['rid_close'] for nav in navs] navs = [nav['rid_close'] for nav in navs]
elif type == 'FUND': elif type == 'FUND':
navs = get_fund_list(fund_ids=id, min_date=start, limit=predict_term) navs = get_fund_list(fund_ids=id, min_date=start, limit=predict_term + 1)
navs = [nav['rfn_nav_cal'] for nav in navs] navs = [nav['rfn_nav_cal'] for nav in navs]
if len(navs) == predict_term: if len(navs) == predict_term:
rtn = navs[-1] / navs[0] - 1 rtn = navs[-1] / navs[0] - 1
......
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