Merge branch 'master' of github.com:quantopian/zipline into fix_infinite_risk

This commit is contained in:
scottsanderson
2012-08-21 15:34:23 -04:00
+6 -1
View File
@@ -166,6 +166,7 @@ class PerformanceTracker(object):
self.event_count = 0
self.last_dict = None
self.exceeded_max_loss = False
self.no_more_updates = False
self.results_socket = None
self.results_addr = None
@@ -203,9 +204,12 @@ class PerformanceTracker(object):
self.todays_performance.positions[sid] = Position(sid)
def update(self, event):
if event.dt == "DONE":
if self.no_more_updates:
return zp.ndict({'dt':0})
elif event.dt == "DONE":
event.perf_message = self.handle_simulation_end()
del event['TRANSACTION']
self.no_more_updates = True
return event
elif self.exceeded_max_loss:
# in case of max_loss, signal to downstream
@@ -213,6 +217,7 @@ class PerformanceTracker(object):
event.dt = "DONE"
event.perf_message = self.handle_simulation_end()
del event['TRANSACTION']
self.no_more_updates = True
return event
else:
event.perf_message = self.process_event(event)