From 71839522cfd9675cb2ba6b31f6036801f2b9e8bb Mon Sep 17 00:00:00 2001 From: scottsanderson Date: Tue, 28 Aug 2012 14:25:17 -0400 Subject: [PATCH] switch current transforms over to the new metaclass --- tests/test_transforms.py | 11 ++++------- zipline/gens/mavg.py | 3 ++- zipline/gens/returns.py | 3 +++ zipline/gens/stddev.py | 3 ++- zipline/gens/vwap.py | 4 +++- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/test_transforms.py b/tests/test_transforms.py index 3672c4e1..d617ce20 100644 --- a/tests/test_transforms.py +++ b/tests/test_transforms.py @@ -153,8 +153,7 @@ class FinanceTransformsTestCase(TestCase): def test_vwap(self): - vwap = StatefulTransform( - VWAP, + vwap = VWAP( market_aware = False, delta = timedelta(days = 2) ) @@ -177,7 +176,7 @@ class FinanceTransformsTestCase(TestCase): def test_returns(self): # Daily returns. - returns = StatefulTransform(Returns, 1) + returns = Returns(1) transformed = list(returns.transform(self.source)) tnfm_vals = [message.tnfm_value for message in transformed] @@ -218,8 +217,7 @@ class FinanceTransformsTestCase(TestCase): def test_moving_average(self): - mavg = StatefulTransform( - MovingAverage, + mavg = MovingAverage( market_aware = False, fields = ['price', 'volume'], delta = timedelta(days = 2), @@ -260,8 +258,7 @@ class FinanceTransformsTestCase(TestCase): self.trading_environment ) - stddev = StatefulTransform( - MovingStandardDev, + stddev = MovingStandardDev( market_aware = False, delta = timedelta(minutes = 150), ) diff --git a/zipline/gens/mavg.py b/zipline/gens/mavg.py index 21aa0bd0..3daba2bc 100644 --- a/zipline/gens/mavg.py +++ b/zipline/gens/mavg.py @@ -3,7 +3,7 @@ from datetime import datetime, timedelta from collections import defaultdict from zipline import ndict -from zipline.gens.transform import EventWindow +from zipline.gens.transform import EventWindow, TransformMeta class MovingAverage(object): """ @@ -12,6 +12,7 @@ class MovingAverage(object): averages over any number of distinct fields (For example, we can maintain a sid's average volume as well as its average price.) """ + __metaclass__ = TransformMeta def __init__(self, fields, market_aware, days = None, delta = None): diff --git a/zipline/gens/returns.py b/zipline/gens/returns.py index 49d3e9b5..a4932485 100644 --- a/zipline/gens/returns.py +++ b/zipline/gens/returns.py @@ -1,3 +1,4 @@ +from zipline.gens.transform import TransformMeta from collections import defaultdict, deque class Returns(object): @@ -5,6 +6,8 @@ class Returns(object): Class that maintains a dictionary from sids to the sid's closing price N trading days ago. """ + __metaclass__ = TransformMeta + def __init__(self, days): self.days = days self.mapping = defaultdict(self._create) diff --git a/zipline/gens/stddev.py b/zipline/gens/stddev.py index 1f46429a..71759b90 100644 --- a/zipline/gens/stddev.py +++ b/zipline/gens/stddev.py @@ -4,7 +4,7 @@ from collections import defaultdict from math import sqrt from zipline import ndict -from zipline.gens.transform import EventWindow +from zipline.gens.transform import EventWindow, TransformMeta class MovingStandardDev(object): """ @@ -13,6 +13,7 @@ class MovingStandardDev(object): standard deviation of all events falling within the specified window. """ + __metaclass__ = TransformMeta def __init__(self, market_aware, days = None, delta = None): diff --git a/zipline/gens/vwap.py b/zipline/gens/vwap.py index 5a0947d8..b2e72dfd 100644 --- a/zipline/gens/vwap.py +++ b/zipline/gens/vwap.py @@ -3,12 +3,14 @@ from datetime import datetime, timedelta from collections import defaultdict from zipline import ndict -from zipline.gens.transform import EventWindow +from zipline.gens.transform import EventWindow, TransformMeta class VWAP(object): """ Class that maintains a dictionary from sids to VWAPEventWindows. """ + __metaclass__ = TransformMeta + def __init__(self, market_aware, delta=None, days=None): self.market_aware = market_aware