From e1608ad3f3a0ca6f0e31e97b828b761a6caf6d88 Mon Sep 17 00:00:00 2001 From: Eddie Hebert Date: Mon, 10 Feb 2014 15:24:18 -0500 Subject: [PATCH] MAINT: Always defer to the algorithms data frequency. For compatibility with existing behavior of having the, data_frequency of the algorithm override the simulation parameters. We may want to consider throwing an exception if the two do not match. --- zipline/algorithm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zipline/algorithm.py b/zipline/algorithm.py index ea44aa78..fd9a0c41 100644 --- a/zipline/algorithm.py +++ b/zipline/algorithm.py @@ -144,7 +144,7 @@ class TradingAlgorithm(object): if self.sim_params: if self.data_frequency is None: self.data_frequency = self.sim_params.data_frequency - elif self.sim_params.data_frequency is None: + else: self.sim_params.data_frequency = self.data_frequency self.perf_tracker = PerformanceTracker(self.sim_params)