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

MAINT: Cleaned up to_dict highlighting daily and minutely difference.

Browse Source 
Make the difference between the two emission rates more exact.
This commit is contained in:
fawce
2013-05-07 18:44:44 -04:00
committed by Eddie Hebert
parent 2d850d0970
commit 3d8674ffb6
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zipline/finance/performance.py
+8 -12
View File
@@ -270,20 +270,16 @@ class PerformanceTracker(object):
'period_end': self.period_end,
'capital_base': self.capital_base,
'cumulative_perf': self.cumulative_performance.to_dict(),
'progress': self.progress
'progress': self.progress,
'cumulative_risk_metrics': self.cumulative_risk_metrics.to_dict()
}
if emission_type == 'daily':
_dict.update({'cumulative_risk_metrics':
self.cumulative_risk_metrics.to_dict(),
'daily_perf':
self.todays_performance.to_dict()})
if emission_type == 'minute':
_dict['intraday_risk_metrics'] = \
self.intraday_risk_metrics.to_dict()
_dict['minute_perf'] = self.todays_performance.to_dict(
self.saved_dt)
_dict['cumulative_risk_metrics'] = \
self.cumulative_risk_metrics.to_dict()
_dict.update({'daily_perf': self.todays_performance.to_dict()})
elif emission_type == 'minute':
_dict.update({
'intraday_risk_metrics': self.intraday_risk_metrics.to_dict(),
'minute_perf': self.todays_performance.to_dict(self.saved_dt)
})
return _dict