Merge pull request #470 from quantopian/remove-overnight-minutes

BUG: Changed benchmark returns to only contain market minutes.
This commit is contained in:
Delaney Granizo-Mackenzie
2015-02-19 12:29:28 -05:00
+10 -4
View File
@@ -69,6 +69,8 @@ import zipline.finance.risk as risk
from zipline.finance import trading
from . period import PerformancePeriod
from zipline.finance.trading import with_environment
log = logbook.Logger('Performance')
@@ -77,7 +79,8 @@ class PerformanceTracker(object):
Tracks the performance of the algorithm.
"""
def __init__(self, sim_params):
@with_environment()
def __init__(self, sim_params, env=None):
self.sim_params = sim_params
@@ -110,9 +113,12 @@ class PerformanceTracker(object):
risk.RiskMetricsCumulative(self.sim_params)
elif self.emission_rate == 'minute':
self.all_benchmark_returns = pd.Series(index=pd.date_range(
self.sim_params.first_open, self.sim_params.last_close,
freq='Min'))
self.all_benchmark_returns = pd.Series(
index=env.minutes_for_days_in_range(
self.sim_params.first_open,
self.sim_params.last_close
)
)
self.intraday_risk_metrics = \
risk.RiskMetricsCumulative(self.sim_params)