diff --git a/tests/test_algorithm.py b/tests/test_algorithm.py index ed53466b..dcf5906b 100644 --- a/tests/test_algorithm.py +++ b/tests/test_algorithm.py @@ -258,22 +258,12 @@ class TestTransformAlgorithm(TestCase): sim_params=self.sim_params, ) self.assertEqual(algo.sim_params.data_frequency, 'daily') - self.assertEqual(algo.annualizer, 250) self.sim_params.data_frequency = 'minute' algo = TestRegisterTransformAlgorithm( sim_params=self.sim_params, ) self.assertEqual(algo.sim_params.data_frequency, 'minute') - self.assertEqual(algo.annualizer, 250 * 6 * 60) - - self.sim_params.data_frequency = 'minute' - algo = TestRegisterTransformAlgorithm( - sim_params=self.sim_params, - annualizer=10 - ) - self.assertEqual(algo.sim_params.data_frequency, 'minute') - self.assertEqual(algo.annualizer, 10) def test_order_methods(self): AlgoClasses = [TestOrderAlgorithm, diff --git a/zipline/algorithm.py b/zipline/algorithm.py index 000a1a98..950ae099 100644 --- a/zipline/algorithm.py +++ b/zipline/algorithm.py @@ -44,7 +44,6 @@ from zipline.finance.controls import ( MaxOrderSize, MaxPositionSize, ) -from zipline.finance.constants import ANNUALIZER from zipline.finance.execution import ( LimitOrder, MarketOrder, @@ -119,9 +118,6 @@ class TradingAlgorithm(object): handle_data function definition. data_frequency : str (daily, hourly or minutely) The duration of the bars. - annualizer : int - Which constant to use for annualizing risk metrics. - If not provided, will extract from data_frequency. capital_base : float How much capital to start with. instant_fill : bool @@ -150,10 +146,6 @@ class TradingAlgorithm(object): self.instant_fill = kwargs.pop('instant_fill', False) - # Override annualizer if set - if 'annualizer' in kwargs: - self.annualizer = kwargs['annualizer'] - # set the capital base self.capital_base = kwargs.pop('capital_base', DEFAULT_CAPITAL_BASE) @@ -677,7 +669,6 @@ class TradingAlgorithm(object): def data_frequency(self, value): assert value in ('daily', 'minute') self.sim_params.data_frequency = value - self.annualizer = ANNUALIZER[self.sim_params.data_frequency] @api_method def order_percent(self, sid, percent,