wassname/catalyst
1
0
Fork 0
mirror of https://github.com/wassname/catalyst.git synced 2026-06-30 01:55:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1609 from quantopian/use-custom-business-day-for-session-loop-logic

Browse Source 
MAINT: Use session index freq for loop logic.
This commit is contained in:
Eddie Hebert
2016-12-05 13:59:07 -05:00
committed by GitHub
parent 47651363c0 31d31bf1d3
commit c166bb0e37
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zipline/assets/roll_finder.py
+8 -8
View File
@@ -89,25 +89,25 @@ class RollFinder(with_metaclass(ABCMeta, object)):
tc = self.trading_calendar
sessions = tc.sessions_in_range(tc.minute_to_session_label(start),
tc.minute_to_session_label(end))
freq = sessions.freq
if first == front:
curr = first_contract << 1
else:
curr = first_contract << 2
sess = sessions[-1]
while sess > start and curr is not None:
session_loc = sessions.searchsorted(sess)
session = sessions[-1]
while session > start and curr is not None:
front = curr.contract.sid
back = curr.next.contract.sid
while session_loc > 0:
session = sessions[session_loc]
prev = sessions[session_loc - 1]
while session > start:
prev = session - freq
if back != self._active_contract(oc, front, back, prev):
rolls.insert(0, ((curr >> offset).contract.sid, session))
break
session_loc -= 1
session = prev
curr = curr.prev
if curr is not None:
sess = curr.contract.auto_close_date
session = curr.contract.auto_close_date
return rolls